@kmkf-fe-packages/kmkf-work-order-service-component 1.1.2 → 1.2.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.
package/README.md CHANGED
@@ -5,7 +5,6 @@
5
5
  * @LastEditors: litian
6
6
  * @LastEditTime: 2022-11-28 16:45:07
7
7
  -->
8
-
9
8
  # kmkf-work-order-service-component
10
9
 
11
10
  ## Getting Started
@@ -39,6 +38,7 @@ Build library via `father`,
39
38
  ```bash
40
39
  $ npm run build
41
40
  ```
41
+
42
42
  11122
43
43
 
44
44
  ## 企业工单工单项目抽离模块
@@ -64,5 +64,5 @@ const Text = ()=>{
64
64
 
65
65
  ```
66
66
 
67
- | 字段 | 说明 | 数据类型 | | ----------------- | ---------------- | ------------------------------------ | | platform | 平台 | TAOBAO =淘宝\|FXG=抖音\|PDD=拼多多\| | | shopId | 店铺 ID | number | | buyerNick | 买家昵称 | string | | buyerId | 买家 id | string | | orderNo | 订单 id | string | | onEmpowerCallback | 授权弹框点击回调 | function |
67
+ | 字段 | 说明 | 数据类型 | | ----------------- | ---------------- | ------------------------------------ | | platform | 平台 | TAOBAO =淘宝\|FXG=抖音\|PDD=拼多多\| | | shopId | 店铺 ID | number | | buyerNick | 买家昵称 | string | | buyerId | 买家 id | string | | orderNo | 订单 id | string | | onEmpowerCallback | 授权弹框点击回调 | function |
68
68
 
@@ -22,23 +22,22 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
22
22
  function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
23
23
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
24
24
  import React, { useState, useRef, useEffect, useMemo, forwardRef, useImperativeHandle } from 'react';
25
- import { ConfigProvider, Form, Space, Tag } from 'antd';
25
+ import { ConfigProvider, Form } from 'antd';
26
26
  import zhCN from 'antd/es/locale/zh_CN';
27
27
  import { get, some, set, every, cloneDeep, isEmpty, intersection, throttle } from 'lodash';
28
28
  import 'moment/locale/zh-cn';
29
29
  import { calcWorkOrderList, orderBack, getReplaceWarnValues, COMPONENT_MAP_NAME, EXCLUDE_REPLACE_TOP_COMPONENT,
30
30
  // 重复检验不需要展示在顶部的
31
31
  INNER_REPLACE_COMPONENT, reversalFormValues, bsSystemOrderBackValues, wlnSystemOrderBackValues, getMappingConfigByTemplateDetail, wdtSystemOrderBackValues, setLogisticsInfo } from "../../../common/utils/tools";
32
- import { replaceCheck, orderDetail, queryLabelByTradeId } from "../../../model/servers/api";
32
+ import { replaceCheck, orderDetail } from "../../../model/servers/api";
33
33
  import { factory } from '@kmkf-fe-packages/services-components';
34
- import { getExpression, formatDisplayConfig, isNull, LabelData } from '@kmkf-fe-packages/kmkf-utils';
34
+ import { getExpression, formatDisplayConfig, isNull } from '@kmkf-fe-packages/kmkf-utils';
35
35
  import ShopName from "../ShopName";
36
36
  import { PlatForm } from "../../../model/flowTemplateDetail/types";
37
37
  import { groupByPreNode, getCurrentNodeModifiedShowHideRule } from "./common";
38
38
  import { getCalculationComponentValue } from "../../../common/utils/arithmetic";
39
39
  import "./index.less";
40
40
  import { CHILD_FIELD_TYPE, CHILD_FIELD_VALUE } from "../../../common/constant";
41
- import { jsonParseSecurity } from "../../../common/utils/tools";
42
41
  var hasComponent = function hasComponent(componentDtoList, workOrderComponentType) {
43
42
  var _componentDtoList$fin;
44
43
  return (_componentDtoList$fin = componentDtoList.find(function (item) {
@@ -112,14 +111,10 @@ var FormRender = function FormRender(props, ref) {
112
111
  _useState4 = _slicedToArray(_useState3, 2),
113
112
  replaceValue = _useState4[0],
114
113
  setReplaceValue = _useState4[1]; //字段重复校验
115
- var _useState5 = useState([]),
114
+ var _useState5 = useState(currentShopId),
116
115
  _useState6 = _slicedToArray(_useState5, 2),
117
- labelList = _useState6[0],
118
- setLabelList = _useState6[1];
119
- var _useState7 = useState(currentShopId),
120
- _useState8 = _slicedToArray(_useState7, 2),
121
- shopId = _useState8[0],
122
- setShopId = _useState8[1];
116
+ shopId = _useState6[0],
117
+ setShopId = _useState6[1];
123
118
  var _Form$useForm = Form.useForm(),
124
119
  _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
125
120
  preNodeForm = _Form$useForm2[0];
@@ -132,13 +127,6 @@ var FormRender = function FormRender(props, ref) {
132
127
  var currentComponentDisplayStatus = useRef({});
133
128
  // TODO:所有组件显影标志
134
129
  var currentTemplateAllComponentsDisplay = useRef({});
135
- // TODO: 标签组件
136
- var labelComponent = useMemo(function () {
137
- var _templateDetail$compo;
138
- return templateDetail === null || templateDetail === void 0 ? void 0 : (_templateDetail$compo = templateDetail.componentDtoList) === null || _templateDetail$compo === void 0 ? void 0 : _templateDetail$compo.find(function (item) {
139
- return item.workOrderComponentType === 'LABEL';
140
- });
141
- }, [templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList]);
142
130
  // TODO: 前置节点form单独设置指
143
131
  useEffect(function () {
144
132
  if (!isEmpty(record)) {
@@ -304,12 +292,6 @@ var FormRender = function FormRender(props, ref) {
304
292
  enterprisePaymentAlipayNo: enterprisePaymentAlipayNo
305
293
  }, templateDetail);
306
294
  };
307
- useEffect(function () {
308
- if (labelComponent && !isNull(record)) {
309
- var _record$jsonMap;
310
- setLabelList(jsonParseSecurity(record === null || record === void 0 ? void 0 : (_record$jsonMap = record.jsonMap) === null || _record$jsonMap === void 0 ? void 0 : _record$jsonMap["".concat(labelComponent === null || labelComponent === void 0 ? void 0 : labelComponent.uniqueKey, "_label")], []));
311
- }
312
- }, [labelComponent, record]);
313
295
  var queryDetail = function queryDetail(_ref2) {
314
296
  var workOrderId = _ref2.workOrderId,
315
297
  shopId = _ref2.shopId,
@@ -336,7 +318,7 @@ var FormRender = function FormRender(props, ref) {
336
318
  return prv;
337
319
  }, {});
338
320
  if (workOrderId) {
339
- var _record$jsonMap2;
321
+ var _record$jsonMap;
340
322
  // 先初始化端上内容
341
323
  var newRecord = cloneDeep(record);
342
324
  var jsonMapOrderId = Object.keys(newRecord.jsonMap).reduce(function (prv, next) {
@@ -365,11 +347,11 @@ var FormRender = function FormRender(props, ref) {
365
347
  batchFillByMapping(initialValues);
366
348
  orderBackReplace(transData, templateDetail);
367
349
  // TODO: 非开始节点录入,都会有workOrderId,这里判断是否有前置组件含有订单号;如果存在订单号,进行订单反填。
368
- var _tradeIdUniqueKey = hasComponent(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList, 'TRADE_ID_INPUT');
369
- if (_tradeIdUniqueKey && shopId && record !== null && record !== void 0 && (_record$jsonMap2 = record.jsonMap) !== null && _record$jsonMap2 !== void 0 && _record$jsonMap2["".concat(_tradeIdUniqueKey, "_tradeId")] && firstOrderBackfill) {
370
- var _record$jsonMap3;
350
+ var tradeIdUniqueKey = hasComponent(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList, 'TRADE_ID_INPUT');
351
+ if (tradeIdUniqueKey && shopId && record !== null && record !== void 0 && (_record$jsonMap = record.jsonMap) !== null && _record$jsonMap !== void 0 && _record$jsonMap["".concat(tradeIdUniqueKey, "_tradeId")] && firstOrderBackfill) {
352
+ var _record$jsonMap2;
371
353
  orderBack({
372
- 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")],
354
+ order_no: record === null || record === void 0 ? void 0 : (_record$jsonMap2 = record.jsonMap) === null || _record$jsonMap2 === void 0 ? void 0 : _record$jsonMap2["".concat(tradeIdUniqueKey, "_tradeId")],
373
355
  form: form,
374
356
  shopId: shopId,
375
357
  shopList: shopList,
@@ -541,66 +523,10 @@ var FormRender = function FormRender(props, ref) {
541
523
  fillByShopId(shopId);
542
524
  }, [shopId]);
543
525
 
544
- // TODO: 标签查询逻辑
545
- var formShopId = Form.useWatch("shopId", form) || shopId;
546
- var tradeIdUniqueKey = hasComponent(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, 'TRADE_ID_INPUT');
547
- var labelUniqueKey = hasComponent(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, 'LABEL');
548
- useEffect(function () {
549
- var tid = form.getFieldValue("".concat(tradeIdUniqueKey, "_tradeId"));
550
- if (!tid) {
551
- setLabelList([]);
552
- }
553
- if (formShopId && tid && labelUniqueKey) {
554
- queryLabels(tid, formShopId);
555
- }
556
- }, [formShopId, tradeIdUniqueKey, labelUniqueKey]);
557
-
558
- // 查询标签
559
- var queryLabels = /*#__PURE__*/function () {
560
- var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(tid, shopId) {
561
- var _yield$queryLabelByTr, _yield$queryLabelByTr2, data;
562
- return _regeneratorRuntime().wrap(function _callee2$(_context2) {
563
- while (1) switch (_context2.prev = _context2.next) {
564
- case 0:
565
- if (!isNull(labelComponent)) {
566
- _context2.next = 2;
567
- break;
568
- }
569
- return _context2.abrupt("return", console.debug('当前节点不需要查询标签'));
570
- case 2:
571
- if (shopId) {
572
- _context2.next = 4;
573
- break;
574
- }
575
- return _context2.abrupt("return", console.debug('查询标签缺少必要参数-shopId'));
576
- case 4:
577
- _context2.next = 6;
578
- return queryLabelByTradeId({
579
- tid: tid,
580
- shopId: shopId
581
- });
582
- case 6:
583
- _yield$queryLabelByTr = _context2.sent;
584
- _yield$queryLabelByTr2 = _yield$queryLabelByTr.data;
585
- data = _yield$queryLabelByTr2 === void 0 ? [] : _yield$queryLabelByTr2;
586
- setLabelList(data);
587
- form.setFieldsValue(_defineProperty({}, "".concat(labelComponent.uniqueKey), data));
588
- case 11:
589
- case "end":
590
- return _context2.stop();
591
- }
592
- }, _callee2);
593
- }));
594
- return function queryLabels(_x4, _x5) {
595
- return _ref3.apply(this, arguments);
596
- };
597
- }();
598
-
599
526
  //订单返填
600
527
  var changeHandle = function changeHandle(order_no) {
601
528
  if (!order_no) return;
602
529
  console.log('[订单返填 changeHandle order_no ] >', order_no);
603
- queryLabels(order_no, formShopId);
604
530
  orderBack({
605
531
  order_no: order_no,
606
532
  form: form,
@@ -653,22 +579,22 @@ var FormRender = function FormRender(props, ref) {
653
579
 
654
580
  //组件失焦事件
655
581
  var componentOnBlur = /*#__PURE__*/function () {
656
- var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(value, type) {
657
- return _regeneratorRuntime().wrap(function _callee3$(_context3) {
658
- while (1) switch (_context3.prev = _context3.next) {
582
+ var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(value, type) {
583
+ return _regeneratorRuntime().wrap(function _callee2$(_context2) {
584
+ while (1) switch (_context2.prev = _context2.next) {
659
585
  case 0:
660
586
  // 针对订单号组件进行当前订单查重校验
661
587
  if ((type === 'tradeId' || type === 'enterprisePaymentTid') && typeof handleChangeTradeId === 'function') {
662
588
  handleChangeTradeId(value);
663
589
  }
664
590
  if (value) {
665
- _context3.next = 4;
591
+ _context2.next = 4;
666
592
  break;
667
593
  }
668
594
  setReplaceValue(function (prev) {
669
595
  return _objectSpread(_objectSpread({}, prev), {}, _defineProperty({}, type, 0));
670
596
  });
671
- return _context3.abrupt("return");
597
+ return _context2.abrupt("return");
672
598
  case 4:
673
599
  queryReplaceCount(_defineProperty({}, type, value), templateDetail);
674
600
  // TODO: ERP不走订单反弹逻辑
@@ -677,12 +603,12 @@ var FormRender = function FormRender(props, ref) {
677
603
  }
678
604
  case 6:
679
605
  case "end":
680
- return _context3.stop();
606
+ return _context2.stop();
681
607
  }
682
- }, _callee3);
608
+ }, _callee2);
683
609
  }));
684
- return function componentOnBlur(_x6, _x7) {
685
- return _ref4.apply(this, arguments);
610
+ return function componentOnBlur(_x4, _x5) {
611
+ return _ref3.apply(this, arguments);
686
612
  };
687
613
  }();
688
614
  // 切换店铺
@@ -690,7 +616,7 @@ var FormRender = function FormRender(props, ref) {
690
616
  setShopId(val);
691
617
  // 清空表单字段
692
618
  var needClearFormFields = get(templateDetail, 'componentDtoList', []).reduce(function (cur, nxt) {
693
- if (['ITEM_SELECT_THIRD', 'STATUS', 'ITEM_SELECT', 'ITEM_ID', 'ITEM_ENCODE', 'JST_LOGISTICS', 'JST_ITEM_SELECT_THIRD', 'JST_SUPPLY', 'JST_SEND_GOOD', 'BS_GOODS', 'BS_EXCHANGE_GOODS', 'BS_REISSUE_GOODS', 'BS_RETURN_GOODS', 'BS_LOGISTICS', 'BS_SEND_GOOD', 'BS_SYSTEM_ORDER', 'WLN_SYSTEM_ORDER', 'WLN_GOODS', 'WLN_LOGISTICS', 'WLN_SEND_GOOD', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WDT_SYSTEM_ORDER', 'WDT_REISSUE_GOODS', 'WDT_RETURN_GOODS', 'WDT_EXCHANGE_GOODS'].includes(nxt === null || nxt === void 0 ? void 0 : nxt.workOrderComponentType)) {
619
+ if (['ITEM_SELECT_THIRD', 'STATUS', 'ITEM_SELECT', 'ITEM_ID', 'ITEM_ENCODE', 'JST_LOGISTICS', 'JST_ITEM_SELECT_THIRD', 'JST_SUPPLY', 'JST_SEND_GOOD', 'BS_GOODS', 'BS_EXCHANGE_GOODS', 'BS_REISSUE_GOODS', 'BS_RETURN_GOODS', 'BS_LOGISTICS', 'BS_SEND_GOOD', 'BS_SYSTEM_ORDER', 'WLN_SYSTEM_ORDER', 'WLN_GOODS', 'WLN_LOGISTICS', 'WLN_SEND_GOOD', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WDT_SYSTEM_ORDER', 'WDT_REISSUE_GOODS'].includes(nxt === null || nxt === void 0 ? void 0 : nxt.workOrderComponentType)) {
694
620
  cur.push(nxt === null || nxt === void 0 ? void 0 : nxt.uniqueKey);
695
621
  }
696
622
  return cur;
@@ -792,7 +718,7 @@ var FormRender = function FormRender(props, ref) {
792
718
  });
793
719
  };
794
720
  var conditionItemResult = function conditionItemResult(item, getFieldValue) {
795
- var _item$leftValue$split, _item$leftValue$split2, _dependenceDetail2, _item$compareSymbol, _item$compareSymbol2;
721
+ var _item$leftValue$split, _item$leftValue$split2, _item$compareSymbol;
796
722
  //现支持子组件控制显隐,格式为${uniqueKey}_${type}与普通组件做区分
797
723
  var isChildField = item.leftValue.includes('_');
798
724
  var prefixId = isChildField ? (_item$leftValue$split = item.leftValue.split('_')) === null || _item$leftValue$split === void 0 ? void 0 : _item$leftValue$split[0] : item.leftValue;
@@ -815,8 +741,7 @@ var FormRender = function FormRender(props, ref) {
815
741
  if (Reflect.has(currentComponentDisplayStatus.current, prefixId) && !currentComponentDisplayStatus.current[prefixId]) {
816
742
  return false;
817
743
  }
818
- console.debug('显影计算', (_dependenceDetail2 = dependenceDetail) === null || _dependenceDetail2 === void 0 ? void 0 : _dependenceDetail2.type, leftValue, (_item$compareSymbol = item.compareSymbol) === null || _item$compareSymbol === void 0 ? void 0 : _item$compareSymbol.toUpperCase(), item.rightValue);
819
- return getExpression((_item$compareSymbol2 = item.compareSymbol) === null || _item$compareSymbol2 === void 0 ? void 0 : _item$compareSymbol2.toUpperCase(), leftValue, item.rightValue);
744
+ return getExpression((_item$compareSymbol = item.compareSymbol) === null || _item$compareSymbol === void 0 ? void 0 : _item$compareSymbol.toUpperCase(), leftValue, item.rightValue);
820
745
  };
821
746
  var getDisplayAndDisabledConfig = function getDisplayAndDisabledConfig(config) {
822
747
  if (isNull(config)) {
@@ -834,6 +759,7 @@ var FormRender = function FormRender(props, ref) {
834
759
  };
835
760
  var newRenderColumnItem = function newRenderColumnItem(effects) {
836
761
  return function (item) {
762
+ var _componentConfig$stat, _componentConfig$stat2;
837
763
  var _item$componentConfig2 = item.componentConfig,
838
764
  componentConfig = _item$componentConfig2 === void 0 ? {} : _item$componentConfig2,
839
765
  workOrderComponentType = item.workOrderComponentType,
@@ -847,19 +773,7 @@ var FormRender = function FormRender(props, ref) {
847
773
  var newComponentConfig = _objectSpread(_objectSpread({}, componentConfig), {}, {
848
774
  disabled: disabled
849
775
  });
850
- var _ref5 = (componentConfig === null || componentConfig === void 0 ? void 0 : componentConfig.status) || {},
851
- upgrade = _ref5.upgrade,
852
- created = _ref5.created;
853
- if (['REISSUE_TRADE_ID', 'EXCHANGE_TRADE_ID'].includes(workOrderComponentType)) {
854
- // 补发单id和换货单id默认值是可见不可编辑(2)
855
- if (typeof upgrade !== 'number') {
856
- upgrade = 2;
857
- }
858
- if (typeof created !== 'number') {
859
- created = 2;
860
- }
861
- }
862
- var _getDisplayAndDisable = getDisplayAndDisabledConfig(workOrderId ? upgrade : created),
776
+ var _getDisplayAndDisable = getDisplayAndDisabledConfig(workOrderId ? componentConfig === null || componentConfig === void 0 ? void 0 : (_componentConfig$stat = componentConfig.status) === null || _componentConfig$stat === void 0 ? void 0 : _componentConfig$stat.upgrade : componentConfig === null || componentConfig === void 0 ? void 0 : (_componentConfig$stat2 = componentConfig.status) === null || _componentConfig$stat2 === void 0 ? void 0 : _componentConfig$stat2.created),
863
777
  componentCanEdit = _getDisplayAndDisable.disabled,
864
778
  componentCanShow = _getDisplayAndDisable.display;
865
779
  // TODO: 非前置节点组件渲染消费是否可以编辑配置
@@ -912,8 +826,8 @@ var FormRender = function FormRender(props, ref) {
912
826
  shouldUpdate: function shouldUpdate() {
913
827
  return true; // TODO: 修复重复依赖的问题 https://tb.raycloud.com/task/64e4491e0b8b5c001e1099b9
914
828
  }
915
- }, function (_ref6) {
916
- var getFieldValue = _ref6.getFieldValue;
829
+ }, function (_ref4) {
830
+ var getFieldValue = _ref4.getFieldValue;
917
831
  var show = currentIdDependenceOtherFields === null || currentIdDependenceOtherFields === void 0 ? void 0 : currentIdDependenceOtherFields.reduce(function (cur, nxt) {
918
832
  // 如果有一项满足展示条件则展示
919
833
  if (cur) {
@@ -1005,8 +919,8 @@ var FormRender = function FormRender(props, ref) {
1005
919
  }, [platform, templateDetail, shopList, shopId, record, mappdingHideComponents, currentShopId, look, handleChangeTradeId, innerReplaceValue]);
1006
920
  // TODO: 计算类型组件列表
1007
921
  var calculationTypeComponentList = useMemo(function () {
1008
- var _templateDetail$compo2;
1009
- return templateDetail === null || templateDetail === void 0 ? void 0 : (_templateDetail$compo2 = templateDetail.componentDtoList) === null || _templateDetail$compo2 === void 0 ? void 0 : _templateDetail$compo2.filter(function (item) {
922
+ var _templateDetail$compo;
923
+ return templateDetail === null || templateDetail === void 0 ? void 0 : (_templateDetail$compo = templateDetail.componentDtoList) === null || _templateDetail$compo === void 0 ? void 0 : _templateDetail$compo.filter(function (item) {
1010
924
  return item.workOrderComponentType === 'NUMERICAL_CALCULATION';
1011
925
  });
1012
926
  }, [templateDetail]);
@@ -1030,10 +944,10 @@ var FormRender = function FormRender(props, ref) {
1030
944
  //如果是初始化创建工单 缓存信息
1031
945
  if (!workOrderId && ['fxg', 'tb', 'ks', 'xiaozhi'].includes(plat.platform)) {
1032
946
  var _tempLateList$find;
1033
- var _tradeIdUniqueKey2 = (_tempLateList$find = tempLateList.find(function (item) {
947
+ var tradeIdUniqueKey = (_tempLateList$find = tempLateList.find(function (item) {
1034
948
  return item.workOrderComponentType === 'TRADE_ID_INPUT';
1035
949
  })) === null || _tempLateList$find === void 0 ? void 0 : _tempLateList$find.uniqueKey;
1036
- var tradeId = value[_tradeIdUniqueKey2];
950
+ var tradeId = value[tradeIdUniqueKey];
1037
951
  if (plat !== null && plat !== void 0 && plat.subOrderNo) {
1038
952
  var cacheOmsOrderInfo = JSON.parse(sessionStorage.getItem('cacheOmsOrderInfo') || '{}');
1039
953
  sessionStorage.setItem('cacheOmsOrderInfo', JSON.stringify(_objectSpread(_objectSpread({}, cacheOmsOrderInfo), {}, _defineProperty({}, "".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId), _defineProperty({}, plat === null || plat === void 0 ? void 0 : plat.subOrderNo, value)))));
@@ -1104,20 +1018,6 @@ var FormRender = function FormRender(props, ref) {
1104
1018
  className: "tipBox"
1105
1019
  }, Object.keys(filterReplaceValue).map(function (key) {
1106
1020
  return filterReplaceValue[key] > 0 && /*#__PURE__*/React.createElement("div", null, "\u63D0\u793A\uFF1A\u8BE5", COMPONENT_MAP_NAME[key], "\u9488\u5BF9\u6B64\u6A21\u677F\u5DF2\u521B\u5EFA\u8FC7", replaceValue[key], "\u6761\u5DE5\u5355\uFF01");
1107
- })), (labelList === null || labelList === void 0 ? void 0 : labelList.length) > 0 && /*#__PURE__*/React.createElement(Space, {
1108
- wrap: true,
1109
- style: {
1110
- marginBottom: '8px'
1111
- }
1112
- }, labelList === null || labelList === void 0 ? void 0 : labelList.map(function (l) {
1113
- var _LabelData$getInstanc;
1114
- var label = ((_LabelData$getInstanc = LabelData.getInstance().labelData) === null || _LabelData$getInstanc === void 0 ? void 0 : _LabelData$getInstanc.find(function (item) {
1115
- return item.value === (l === null || l === void 0 ? void 0 : l.labelShowName);
1116
- })) || {};
1117
- if (!isNull(label)) return /*#__PURE__*/React.createElement(Tag, {
1118
- color: label === null || label === void 0 ? void 0 : label.color
1119
- }, label === null || label === void 0 ? void 0 : label.label);
1120
- return null;
1121
1021
  })), /*#__PURE__*/React.createElement(Form, _extends({
1122
1022
  form: preNodeForm
1123
1023
  }, formProps), preNodeFormItems), /*#__PURE__*/React.createElement(Form, _extends({
@@ -26,12 +26,8 @@ import Header from "../Header";
26
26
  import FormRender from "../FormRender";
27
27
  import RenderDetail from "../RenderDetail";
28
28
  import { calcWorkOrderList } from "../../../common/utils/tools";
29
- import { queryNodeDetail, queryMultiNodeAssistantInfo
30
- // queryLabelByTradeId
31
- } from "../../../model/flowTemplateDetail/api";
32
- import { setAction, setWithdrawWorkOrderDetail, setNodeAssistantInfo
33
- // setLabelList
34
- } from "../../../model/flowTemplateDetail";
29
+ import { queryNodeDetail, queryMultiNodeAssistantInfo } from "../../../model/flowTemplateDetail/api";
30
+ import { setAction, setWithdrawWorkOrderDetail, setNodeAssistantInfo } from "../../../model/flowTemplateDetail";
35
31
  import { selectPlatInfo, selectFlowStatus, selectCurrentFlowAllShowHideRules, selectNodeAssistantMap } from "../../../model/flowTemplateDetail/selector";
36
32
  import { FlowStatus, NodeType } from "../../../model/flowTemplateDetail/types";
37
33
  import { modifyWorkOrder } from "../../../model/flowTemplateDetail/api";
@@ -238,16 +234,6 @@ var NodeItem = function NodeItem(props) {
238
234
  // 撤回按钮展示逻辑
239
235
  // todo: 人工节点 + 节点权限 + 后续节点是否有人工节点或者自动化任务
240
236
  var showWithdraw = isArtificialNode && open && isCurrentNodeHandler && canWithdraw && !readonly;
241
- // const handleChangeTradeId = async (tid: string) => {
242
- // if (data?.data?.nodeInfo?.nodeType !== NodeType.START_NODE) {
243
- // console.debug('当前节点不需要查询标签')
244
- // }
245
- // if (tid) {
246
- // // TODO: 查询标签
247
- // const { data } = await queryLabelByTradeId({ tid })
248
- // dispatch(setLabelList(data?.map(item => item?.labelShowName) || []))
249
- // }
250
- // };
251
237
  var _calcWorkOrderList = calcWorkOrderList([(data === null || data === void 0 ? void 0 : (_data$data10 = data.data) === null || _data$data10 === void 0 ? void 0 : _data$data10.workOrder) || {}], [].concat(_toConsumableArray((data === null || data === void 0 ? void 0 : (_data$data11 = data.data) === null || _data$data11 === void 0 ? void 0 : (_data$data11$workOrde = _data$data11.workOrderTemplateInfo) === null || _data$data11$workOrde === void 0 ? void 0 : _data$data11$workOrde.preNodeComponentDtoList) || []), _toConsumableArray((data === null || data === void 0 ? void 0 : (_data$data12 = data.data) === null || _data$data12 === void 0 ? void 0 : (_data$data12$workOrde = _data$data12.workOrderTemplateInfo) === null || _data$data12$workOrde === void 0 ? void 0 : _data$data12$workOrde.componentDtoList) || []))),
252
238
  _calcWorkOrderList2 = _slicedToArray(_calcWorkOrderList, 1),
253
239
  transData = _calcWorkOrderList2[0];
@@ -290,7 +276,6 @@ var NodeItem = function NodeItem(props) {
290
276
  canModifyPayment: false,
291
277
  flowAllShowHideRules: allShowHideRules,
292
278
  firstOrderBackfill: false // TODO: 前面节点必然是已完成状态,已完成状态不再调用订单反填
293
- // handleChangeTradeId={handleChangeTradeId}
294
279
  }) : /*#__PURE__*/React.createElement(RenderDetail, {
295
280
  workOrderTemplateInfo: data === null || data === void 0 ? void 0 : (_data$data19 = data.data) === null || _data$data19 === void 0 ? void 0 : _data$data19.workOrderTemplateInfo,
296
281
  transData: transData,
@@ -21,9 +21,7 @@ import { useDispatch, useSelector, Provider, batch } from 'react-redux';
21
21
  import store from "../model/store";
22
22
  import zhCN from 'antd/es/locale/zh_CN';
23
23
  import { calcWorkOrderList, deleteCacheOrder } from "../common/utils/tools";
24
- import { setPlat, fetchPanelInfo, fetchAllFlowOperateRecord, setAction, setVisibleRemarkList, setAddRemarkVisible, setLoading, setClearStore
25
- // setLabelList
26
- } from "../model/flowTemplateDetail";
24
+ import { setPlat, fetchPanelInfo, fetchAllFlowOperateRecord, setAction, setVisibleRemarkList, setAddRemarkVisible, setLoading, setClearStore } from "../model/flowTemplateDetail";
27
25
  import { selectFlowRecordList, selectRemarkRecordList, selectCurrentNodeDetail, selectTid, selectShopUniqueKey, selectOperateParams, selectFlowStatus, selectCurrentTradeIdWOrkOrderNumber, selectFlowTemplateId, selectLoading, selectWithDrawOrder, selectNodeAssistantMap, selectFlowTemplateType } from "../model/flowTemplateDetail/selector";
28
26
  import { NodeType, FlowStatus, FlowType } from "../model/flowTemplateDetail/types";
29
27
  import NodeItem from "./components/Item";
@@ -985,10 +983,9 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
985
983
  }, /*#__PURE__*/React.createElement("div", {
986
984
  className: "flowWorkOrderDetail"
987
985
  }, flowStatus && /*#__PURE__*/React.createElement(Row, {
988
- justify: 'space-between',
989
- className: "header"
986
+ justify: 'space-between'
990
987
  }, /*#__PURE__*/React.createElement(Col, null, /*#__PURE__*/React.createElement("div", {
991
- className: "statusWrap"
988
+ className: "header"
992
989
  }, "\u6D41\u7A0B\u72B6\u6001\uFF1A", /*#__PURE__*/React.createElement("div", {
993
990
  className: "status ".concat(flowStatus)
994
991
  }), /*#__PURE__*/React.createElement("span", null, FLOW_STATUS_V2[flowStatus]))), flowTemplateType !== 'SINGLE_PAGE' && /*#__PURE__*/React.createElement(Col, {
@@ -6,19 +6,16 @@
6
6
  width: 200px
7
7
  }
8
8
  .header {
9
+ display: flex;
10
+ align-items: center;
9
11
  background: #FFF;
10
12
  height: 24px;
11
13
  width: 100%;
12
14
  margin-bottom: 8px;
13
15
  box-sizing: content-box;
14
- z-index: 99;
15
- padding: 8px;
16
- .statusWrap {
17
- display: flex;
18
- align-items: center;
19
- > span {
20
- margin-left: 8px;
21
- }
16
+ z-index: 2;
17
+ > span {
18
+ margin-left: 8px;
22
19
  }
23
20
  .status {
24
21
  width: 8px;
@@ -926,18 +926,6 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
926
926
  name: item.name
927
927
  });
928
928
  }
929
- } else if (item.workOrderComponentType === 'WDT_EXCHANGE_GOODS') {
930
- var wdtExchange = get(nowData, "".concat(item.uniqueKey), {});
931
- contentVoList.push({
932
- uniqueKey: "".concat(item.uniqueKey, "_wdtExchangeGoods"),
933
- content: wdtExchange === null || wdtExchange === void 0 ? void 0 : wdtExchange.wdtExchangeGoods,
934
- name: item.name
935
- });
936
- contentVoList.push({
937
- uniqueKey: "".concat(item.uniqueKey, "_shopCode"),
938
- content: (wdtExchange === null || wdtExchange === void 0 ? void 0 : wdtExchange.shopCode) || '',
939
- name: item.name
940
- });
941
929
  } else if (['BS_REISSUE_GOODS', 'WDT_REISSUE_GOODS'].includes(item.workOrderComponentType)) {
942
930
  var reissueMap = {
943
931
  BS_REISSUE_GOODS: {
@@ -975,34 +963,21 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
975
963
  name: item.name
976
964
  });
977
965
  }
978
- } else if (['BS_RETURN_GOODS', 'WDT_RETURN_GOODS'].includes(item.workOrderComponentType)) {
979
- var currentReturn = get(nowData, "".concat(item.uniqueKey), {});
980
- var compType = item.workOrderComponentType;
981
- var returnGoodsMap = {
982
- BS_RETURN_GOODS: {
983
- returnTypeKey: 'bsReturnType',
984
- returnGoodsKey: 'bsReturnGoods',
985
- shopCodeKey: 'shopCode'
986
- },
987
- WDT_RETURN_GOODS: {
988
- returnTypeKey: 'wdtReturnType',
989
- returnGoodsKey: 'wdtReturnGoods',
990
- shopCodeKey: 'shopCode'
991
- }
992
- };
966
+ } else if (item.workOrderComponentType === 'BS_RETURN_GOODS') {
967
+ var bsReturn = get(nowData, "".concat(item.uniqueKey), {});
993
968
  contentVoList.push({
994
- uniqueKey: "".concat(item.uniqueKey, "_").concat(returnGoodsMap[compType].returnTypeKey),
995
- content: currentReturn === null || currentReturn === void 0 ? void 0 : currentReturn[returnGoodsMap[compType].returnTypeKey],
969
+ uniqueKey: "".concat(item.uniqueKey, "_bsReturnType"),
970
+ content: bsReturn === null || bsReturn === void 0 ? void 0 : bsReturn.bsReturnType,
996
971
  name: item.name
997
972
  });
998
973
  contentVoList.push({
999
- uniqueKey: "".concat(item.uniqueKey, "_").concat(returnGoodsMap[compType].returnGoodsKey),
1000
- content: currentReturn === null || currentReturn === void 0 ? void 0 : currentReturn[returnGoodsMap[compType].returnGoodsKey],
974
+ uniqueKey: "".concat(item.uniqueKey, "_bsReturnGoods"),
975
+ content: bsReturn === null || bsReturn === void 0 ? void 0 : bsReturn.bsReturnGoods,
1001
976
  name: item.name
1002
977
  });
1003
978
  contentVoList.push({
1004
- uniqueKey: "".concat(item.uniqueKey, "_").concat(returnGoodsMap[compType].shopCodeKey),
1005
- content: (currentReturn === null || currentReturn === void 0 ? void 0 : currentReturn[returnGoodsMap[compType].shopCodeKey]) || '',
979
+ uniqueKey: "".concat(item.uniqueKey, "_shopCode"),
980
+ content: (bsReturn === null || bsReturn === void 0 ? void 0 : bsReturn.shopCode) || '',
1006
981
  name: item.name
1007
982
  });
1008
983
  } else if (item.workOrderComponentType === 'BS_POSTING') {
@@ -1400,9 +1375,10 @@ var transDataSource = function transDataSource(templateColumns) {
1400
1375
  flag: item.jsonMap["".concat(nex.uniqueKey, "_bsFlag")]
1401
1376
  }));
1402
1377
  } else if (nex.workOrderComponentType === 'REISSUE_LOGISTICS') {
1403
- var _itemList6 = jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_reissueLogisticsList")], [
1404
- // { logisticsCompany: null, logisticsCode: null },
1405
- ]);
1378
+ var _itemList6 = jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_reissueLogisticsList")], [{
1379
+ logisticsCompany: null,
1380
+ logisticsCode: null
1381
+ }]);
1406
1382
  return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), _itemList6));
1407
1383
  } else if (['REISSUE_STATUS', 'ADJUST_WORK_ORDER_STATUS', 'CREATE_STATUS', 'INVOICE_STATUS', 'INVOICING_STATUS'].includes(nex.workOrderComponentType)) {
1408
1384
  var STATUS_MAP = {
@@ -1438,7 +1414,11 @@ var transDataSource = function transDataSource(templateColumns) {
1438
1414
  WAREHOUSING_STATUS: 'inStockStatusItemList',
1439
1415
  MSG_STATUS: 'msgStatusValues'
1440
1416
  };
1441
- return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_").concat(STATUS_LIST_MAP[nex.workOrderComponentType])], [])));
1417
+ return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_").concat(STATUS_LIST_MAP[nex.workOrderComponentType])], ['WAREHOUSING_STATUS', 'MSG_STATUS'].includes(nex.workOrderComponentType) ? [] : [{
1418
+ status: undefined,
1419
+ reason: '',
1420
+ systemOrderId: ''
1421
+ }])));
1442
1422
  } else if (['BS_LOGISTICS', 'WLN_LOGISTICS', 'WDT_LOGISTICS'].includes(nex.workOrderComponentType)) {
1443
1423
  var LogisticsMap = {
1444
1424
  BS_LOGISTICS: {
@@ -1554,27 +1534,12 @@ var transDataSource = function transDataSource(templateColumns) {
1554
1534
  bsExchangeGiftGoods: jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_bsExchangeGiftGoods")], []),
1555
1535
  shopCode: item.jsonMap["".concat(nex.uniqueKey, "_shopCode")]
1556
1536
  }));
1557
- } else if (nex.workOrderComponentType === 'WDT_EXCHANGE_GOODS') {
1537
+ } else if (nex.workOrderComponentType === 'BS_RETURN_GOODS') {
1558
1538
  return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), {
1559
- wdtExchangeGoods: jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_wdtExchangeGoods")], []),
1539
+ bsReturnType: jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_bsReturnType")], []),
1540
+ bsReturnGoods: jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_bsReturnGoods")], []),
1560
1541
  shopCode: item.jsonMap["".concat(nex.uniqueKey, "_shopCode")]
1561
1542
  }));
1562
- } else if (['BS_RETURN_GOODS', 'WDT_RETURN_GOODS'].includes(nex.workOrderComponentType)) {
1563
- var _$concat2;
1564
- var compType = nex.workOrderComponentType;
1565
- var returnGoodsMap = {
1566
- BS_RETURN_GOODS: {
1567
- returnTypeKey: 'bsReturnType',
1568
- returnGoodsKey: 'bsReturnGoods',
1569
- shopCodeKey: 'shopCode'
1570
- },
1571
- WDT_RETURN_GOODS: {
1572
- returnTypeKey: 'wdtReturnType',
1573
- returnGoodsKey: 'wdtReturnGoods',
1574
- shopCodeKey: 'shopCode'
1575
- }
1576
- };
1577
- return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), (_$concat2 = {}, _defineProperty(_$concat2, returnGoodsMap[compType].returnTypeKey, jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_").concat(returnGoodsMap[compType].returnTypeKey)], [])), _defineProperty(_$concat2, returnGoodsMap[compType].returnGoodsKey, jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_").concat(returnGoodsMap[compType].returnGoodsKey)], [])), _defineProperty(_$concat2, returnGoodsMap[compType].shopCodeKey, item.jsonMap["".concat(nex.uniqueKey, "_").concat(returnGoodsMap[compType].shopCodeKey)]), _$concat2)));
1578
1543
  } else if (['BS_SYSTEM_ORDER', 'WLN_SYSTEM_ORDER', 'WDT_SYSTEM_ORDER'].includes(nex.workOrderComponentType)) {
1579
1544
  var systemOrderMap = {
1580
1545
  BS_SYSTEM_ORDER: {
@@ -1612,17 +1577,24 @@ var transDataSource = function transDataSource(templateColumns) {
1612
1577
  },
1613
1578
  RETURN_GOODS_TRADE_ID: {
1614
1579
  key: 'returnGoodsTradeItemList',
1615
- defaultValue: []
1616
- // defaultValue: [{ returnGoodsTradeId: '', systemOrderId: '' }],
1580
+ defaultValue: [{
1581
+ returnGoodsTradeId: '',
1582
+ systemOrderId: ''
1583
+ }]
1617
1584
  },
1618
-
1619
1585
  REISSUE_TRADE_ID: {
1620
1586
  key: 'tradeItemList',
1621
- defaultValue: []
1587
+ defaultValue: [{
1588
+ billNo: '',
1589
+ tradeId: ''
1590
+ }]
1622
1591
  },
1623
1592
  EXCHANGE_TRADE_ID: {
1624
1593
  key: 'tradeItemList',
1625
- defaultValue: []
1594
+ defaultValue: [{
1595
+ billNo: '',
1596
+ tradeId: ''
1597
+ }]
1626
1598
  }
1627
1599
  };
1628
1600
  return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_").concat(SYSTEM_ORDER_MAP[nex.workOrderComponentType].key)], SYSTEM_ORDER_MAP[nex.workOrderComponentType].defaultValue)));
@@ -1638,9 +1610,6 @@ var transDataSource = function transDataSource(templateColumns) {
1638
1610
  shopCode: item.jsonMap["".concat(nex.uniqueKey, "_shopCode")],
1639
1611
  wdtSystemOrderNo: item.jsonMap["".concat(nex.uniqueKey, "_wdtSystemOrderNo")]
1640
1612
  }));
1641
- } else if (nex.workOrderComponentType === 'LABEL') {
1642
- var _objectSpread55;
1643
- 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));
1644
1613
  }
1645
1614
  }, {});
1646
1615
  };
@@ -1662,7 +1631,7 @@ export var calcWorkOrderList = function calcWorkOrderList(source, templateColumn
1662
1631
  //订单返填
1663
1632
  export var orderBack = /*#__PURE__*/function () {
1664
1633
  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
1665
- 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, _objectSpread57, _cacheOrderInfo;
1634
+ 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, _objectSpread55, _cacheOrderInfo;
1666
1635
  return _regeneratorRuntime().wrap(function _callee$(_context) {
1667
1636
  while (1) switch (_context.prev = _context.next) {
1668
1637
  case 0:
@@ -1776,10 +1745,8 @@ export var orderBack = /*#__PURE__*/function () {
1776
1745
  });
1777
1746
  }
1778
1747
  bsInfo = bsOrderTransform(bsOrders || {});
1779
- wlnInfo = wlnOrderTransform(wlnOrders || {}); // const wdtInfo = wdtOrderTransform(wdtOrders || {});
1780
- wdtInfo = wdtOrderTransform(_objectSpread(_objectSpread({}, wdtOrders), {}, {
1781
- componentList: templateDetail.componentDtoList
1782
- }), form);
1748
+ wlnInfo = wlnOrderTransform(wlnOrders || {});
1749
+ wdtInfo = wdtOrderTransform(wdtOrders || {});
1783
1750
  if ((bsOrders === null || bsOrders === void 0 ? void 0 : (_bsOrders$orders = bsOrders.orders) === null || _bsOrders$orders === void 0 ? void 0 : _bsOrders$orders.length) > 1) {
1784
1751
  bsInfo.bsGoods = _objectSpread(_objectSpread({}, bsInfo.bsGoods), {}, {
1785
1752
  bsGoods: []
@@ -1903,7 +1870,7 @@ export var orderBack = /*#__PURE__*/function () {
1903
1870
  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))))));
1904
1871
  } else {
1905
1872
  _cacheOrderInfo = JSON.parse(sessionStorage.getItem('cacheOrderInfo') || '{}');
1906
- sessionStorage.setItem('cacheOrderInfo', JSON.stringify(_objectSpread(_objectSpread({}, _cacheOrderInfo), {}, (_objectSpread57 = {}, _defineProperty(_objectSpread57, order_no, values), _defineProperty(_objectSpread57, "".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId), _defineProperty({}, order_no, _objectSpread(_objectSpread({}, formValue), values))), _objectSpread57))));
1873
+ sessionStorage.setItem('cacheOrderInfo', JSON.stringify(_objectSpread(_objectSpread({}, _cacheOrderInfo), {}, (_objectSpread55 = {}, _defineProperty(_objectSpread55, order_no, values), _defineProperty(_objectSpread55, "".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId), _defineProperty({}, order_no, _objectSpread(_objectSpread({}, formValue), values))), _objectSpread55))));
1907
1874
  }
1908
1875
  }
1909
1876
  // console.log('orderback', values);
@@ -2224,8 +2191,6 @@ export var reversalFormValues = function reversalFormValues() {
2224
2191
  case 'BS_EXCHANGE_GOODS':
2225
2192
  case 'BS_RETURN_GOODS':
2226
2193
  case 'WDT_REISSUE_GOODS':
2227
- case 'WDT_RETURN_GOODS':
2228
- case 'WDT_EXCHANGE_GOODS':
2229
2194
  prv["".concat(next.uniqueKey, "_shopCode")] = values[next.uniqueKey]['shopCode'];
2230
2195
  break;
2231
2196
  case 'BS_DELIVERY_NO':
@@ -10,6 +10,6 @@ export declare const setFlowList: import("@reduxjs/toolkit").ActionCreatorWithPa
10
10
  lastWorkOrderDetail: any;
11
11
  }, "flowTemplateDetail/setCurrentTradeIdWOrkOrderNumber">, setFlowTemplateId: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, "flowTemplateDetail/setFlowTemplateId">, setLoading: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, "flowTemplateDetail/setLoading">, setCurrentFlowAllShowHideRules: import("@reduxjs/toolkit").ActionCreatorWithPayload<CurrentFlowShowHideRules, "flowTemplateDetail/setCurrentFlowAllShowHideRules">, setClearStore: import("@reduxjs/toolkit").ActionCreatorWithOptionalPayload<undefined, "flowTemplateDetail/setClearStore">, setWithdrawWorkOrderDetail: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
12
12
  nodeId: string;
13
- }, "flowTemplateDetail/setWithdrawWorkOrderDetail">, setFlowTemplateType: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, "flowTemplateDetail/setFlowTemplateType">, setLabelList: import("@reduxjs/toolkit").ActionCreatorWithPayload<string[], "flowTemplateDetail/setLabelList">, clearLabelList: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"flowTemplateDetail/clearLabelList">;
13
+ }, "flowTemplateDetail/setWithdrawWorkOrderDetail">, setFlowTemplateType: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, "flowTemplateDetail/setFlowTemplateType">;
14
14
  declare const _default: import("redux").Reducer<FlowTemplateDetailState, import("redux").AnyAction>;
15
15
  export default _default;
@@ -40,8 +40,7 @@ export var initialState = {
40
40
  },
41
41
  tid: '',
42
42
  shopUniqueKey: '',
43
- flowTemplateType: '',
44
- labelList: []
43
+ flowTemplateType: ''
45
44
  };
46
45
  export var fetchPanelInfo = function fetchPanelInfo(params, options) {
47
46
  return /*#__PURE__*/function () {
@@ -315,13 +314,6 @@ var slice = createSlice({
315
314
  setFlowTemplateType: function setFlowTemplateType(state, _ref22) {
316
315
  var payload = _ref22.payload;
317
316
  state.flowTemplateType = payload;
318
- },
319
- setLabelList: function setLabelList(state, _ref23) {
320
- var payload = _ref23.payload;
321
- state.labelList = payload;
322
- },
323
- clearLabelList: function clearLabelList(state) {
324
- state.labelList = [];
325
317
  }
326
318
  }
327
319
  });
@@ -344,8 +336,6 @@ var _slice$actions = slice.actions,
344
336
  setCurrentFlowAllShowHideRules = _slice$actions.setCurrentFlowAllShowHideRules,
345
337
  setClearStore = _slice$actions.setClearStore,
346
338
  setWithdrawWorkOrderDetail = _slice$actions.setWithdrawWorkOrderDetail,
347
- setFlowTemplateType = _slice$actions.setFlowTemplateType,
348
- setLabelList = _slice$actions.setLabelList,
349
- clearLabelList = _slice$actions.clearLabelList;
350
- export { setFlowList, setNodeAssistantInfo, setTid, setShopUniqueKey, setRemarkList, setCurrentNode, setAction, setVisibleRemarkList, setPlat, setOperateParams, setAddRemarkVisible, setFlowStatus, setCurrentTradeIdWOrkOrderNumber, setFlowTemplateId, setLoading, setCurrentFlowAllShowHideRules, setClearStore, setWithdrawWorkOrderDetail, setFlowTemplateType, setLabelList, clearLabelList };
339
+ setFlowTemplateType = _slice$actions.setFlowTemplateType;
340
+ export { setFlowList, setNodeAssistantInfo, setTid, setShopUniqueKey, setRemarkList, setCurrentNode, setAction, setVisibleRemarkList, setPlat, setOperateParams, setAddRemarkVisible, setFlowStatus, setCurrentTradeIdWOrkOrderNumber, setFlowTemplateId, setLoading, setCurrentFlowAllShowHideRules, setClearStore, setWithdrawWorkOrderDetail, setFlowTemplateType };
351
341
  export default slice.reducer;
@@ -698,17 +698,3 @@ export declare const selectFlowTemplateType: ((state: {
698
698
  }> & {
699
699
  clearCache: () => void;
700
700
  };
701
- export declare const selectLabelList: ((state: {
702
- login: import("../login").GlobalState;
703
- global: import("../global").GlobalState;
704
- workOrder: import("../workOrder").WorkOrderState;
705
- customizeWorkOrder: import("../customizeWorkOrder/types").CustomizeWorkOrderState;
706
- paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
707
- singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
708
- logicFlow: import("../logicFlow/types").LogicFlowState;
709
- flowWOrkOrderDetail: import("./types").FlowTemplateDetailState;
710
- }) => string[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").FlowTemplateDetailState) => string[], {
711
- clearCache: () => void;
712
- }> & {
713
- clearCache: () => void;
714
- };
@@ -57,7 +57,4 @@ export var selectWithDrawOrder = createSelector([selectSlice], function (state)
57
57
  });
58
58
  export var selectFlowTemplateType = createSelector([selectSlice], function (state) {
59
59
  return state.flowTemplateType;
60
- });
61
- export var selectLabelList = createSelector([selectSlice], function (state) {
62
- return state.labelList;
63
60
  });
@@ -61,7 +61,6 @@ export interface FlowTemplateDetailState {
61
61
  tid: string;
62
62
  shopUniqueKey: string;
63
63
  flowTemplateType: FlowType;
64
- labelList: Array<string>;
65
64
  }
66
65
  export interface QyFlowPanelInfoRequest {
67
66
  /**
@@ -89,21 +89,22 @@ export var fetchLogicFlowList = /*#__PURE__*/function () {
89
89
  });
90
90
  }
91
91
  return prv;
92
- }, []); // console.log(list);
92
+ }, []);
93
+ console.log(list);
93
94
  dispatch(setLogicFlowList(list || []));
94
95
  dispatch(setGroupLogicFlowList(groupLogicFlowList || []));
95
96
  dispatch(setFlowTemplateGroupWorkOrderTemplateList(flowTemplateGroupWOrkOrderTemplateList) || []);
96
- _context.next = 17;
97
+ _context.next = 18;
97
98
  break;
98
- case 14:
99
- _context.prev = 14;
99
+ case 15:
100
+ _context.prev = 15;
100
101
  _context.t0 = _context["catch"](0);
101
102
  console.error(_context.t0);
102
- case 17:
103
+ case 18:
103
104
  case "end":
104
105
  return _context.stop();
105
106
  }
106
- }, _callee, null, [[0, 14]]);
107
+ }, _callee, null, [[0, 15]]);
107
108
  }));
108
109
  return function fetchLogicFlowList(_x) {
109
110
  return _ref.apply(this, arguments);
@@ -76,7 +76,4 @@ export declare const updatePlatformMemo: (data: {
76
76
  export declare const queryNodesByFlowTemplateKey: (data: string) => Promise<any>;
77
77
  export declare const wlnOrderDetail: (data: any) => Promise<any>;
78
78
  export declare const getSellerRemark: (data?: any) => Promise<any>;
79
- export declare const queryLabelByTradeId: (data: any) => Promise<serverProps<Array<{
80
- labelShowName: string;
81
- }>>>;
82
79
  export declare const createWdtReissueOrder: <REQ = any, RES = any>(data: REQ) => Promise<serverProps<RES>>;
@@ -488,14 +488,6 @@ export var getSellerRemark = function getSellerRemark(data) {
488
488
  });
489
489
  };
490
490
 
491
- // 查询订单所需标签
492
- export var queryLabelByTradeId = function queryLabelByTradeId(data) {
493
- return request({
494
- url: '/qy/gdfw/risk/warning/queryUserLabel',
495
- method: 'post',
496
- data: data
497
- });
498
- };
499
491
  // wdt 创建补发单
500
492
  export var createWdtReissueOrder = function createWdtReissueOrder(data) {
501
493
  return request({
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
3
- "version": "1.1.2",
3
+ "version": "1.2.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.1.2",
36
- "@kmkf-fe-packages/kmkf-utils": "^1.1.2",
37
- "@kmkf-fe-packages/services-components": "^1.1.2",
35
+ "@kmkf-fe-packages/basic-components": "1.2.0",
36
+ "@kmkf-fe-packages/kmkf-utils": "1.2.0",
37
+ "@kmkf-fe-packages/services-components": "1.2.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": "4561254272f4a9cc7e4adc47be66e2e8c77a49c7",
76
+ "gitHead": "b14fc34f8d5d1d37484367f2a09782c4f9d065cb",
77
77
  "gitHooks": {
78
78
  "pre-commit": "lint-staged"
79
79
  }