@kmkf-fe-packages/kmkf-work-order-service-component 1.2.0 → 1.3.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.
@@ -22,22 +22,23 @@ 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 } from 'antd';
25
+ import { ConfigProvider, Form, Space, Tag } 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 } from "../../../model/servers/api";
32
+ import { replaceCheck, orderDetail, queryLabelByTradeId } from "../../../model/servers/api";
33
33
  import { factory } from '@kmkf-fe-packages/services-components';
34
- import { getExpression, formatDisplayConfig, isNull } from '@kmkf-fe-packages/kmkf-utils';
34
+ import { getExpression, formatDisplayConfig, isNull, LabelData } 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";
41
42
  var hasComponent = function hasComponent(componentDtoList, workOrderComponentType) {
42
43
  var _componentDtoList$fin;
43
44
  return (_componentDtoList$fin = componentDtoList.find(function (item) {
@@ -111,10 +112,14 @@ var FormRender = function FormRender(props, ref) {
111
112
  _useState4 = _slicedToArray(_useState3, 2),
112
113
  replaceValue = _useState4[0],
113
114
  setReplaceValue = _useState4[1]; //字段重复校验
114
- var _useState5 = useState(currentShopId),
115
+ var _useState5 = useState([]),
115
116
  _useState6 = _slicedToArray(_useState5, 2),
116
- shopId = _useState6[0],
117
- setShopId = _useState6[1];
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];
118
123
  var _Form$useForm = Form.useForm(),
119
124
  _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
120
125
  preNodeForm = _Form$useForm2[0];
@@ -127,6 +132,13 @@ var FormRender = function FormRender(props, ref) {
127
132
  var currentComponentDisplayStatus = useRef({});
128
133
  // TODO:所有组件显影标志
129
134
  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]);
130
142
  // TODO: 前置节点form单独设置指
131
143
  useEffect(function () {
132
144
  if (!isEmpty(record)) {
@@ -190,7 +202,7 @@ var FormRender = function FormRender(props, ref) {
190
202
  //查询重复数量
191
203
  var queryReplaceCount = /*#__PURE__*/function () {
192
204
  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(componentValue, templateDetail) {
193
- var needCheckComponentList, params, _yield$replaceCheck, resultList, resultParams;
205
+ var needCheckComponentList, _templateDetail$flowT, params, _yield$replaceCheck, resultList, resultParams;
194
206
  return _regeneratorRuntime().wrap(function _callee$(_context) {
195
207
  while (1) switch (_context.prev = _context.next) {
196
208
  case 0:
@@ -203,6 +215,7 @@ var FormRender = function FormRender(props, ref) {
203
215
  break;
204
216
  }
205
217
  params = {
218
+ flowTemplateKey: (_templateDetail$flowT = templateDetail.flowTemplateConfig) === null || _templateDetail$flowT === void 0 ? void 0 : _templateDetail$flowT.flowTemplateKey,
206
219
  templateId: templateDetail.uniqueKey,
207
220
  workOrderUniqueKey: record === null || record === void 0 ? void 0 : record.uniqueKey,
208
221
  needCheckComponentList: needCheckComponentList
@@ -292,6 +305,12 @@ var FormRender = function FormRender(props, ref) {
292
305
  enterprisePaymentAlipayNo: enterprisePaymentAlipayNo
293
306
  }, templateDetail);
294
307
  };
308
+ useEffect(function () {
309
+ if (labelComponent && !isNull(record)) {
310
+ var _record$jsonMap;
311
+ 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")], []));
312
+ }
313
+ }, [labelComponent, record]);
295
314
  var queryDetail = function queryDetail(_ref2) {
296
315
  var workOrderId = _ref2.workOrderId,
297
316
  shopId = _ref2.shopId,
@@ -318,7 +337,7 @@ var FormRender = function FormRender(props, ref) {
318
337
  return prv;
319
338
  }, {});
320
339
  if (workOrderId) {
321
- var _record$jsonMap;
340
+ var _record$jsonMap2;
322
341
  // 先初始化端上内容
323
342
  var newRecord = cloneDeep(record);
324
343
  var jsonMapOrderId = Object.keys(newRecord.jsonMap).reduce(function (prv, next) {
@@ -347,11 +366,11 @@ var FormRender = function FormRender(props, ref) {
347
366
  batchFillByMapping(initialValues);
348
367
  orderBackReplace(transData, templateDetail);
349
368
  // TODO: 非开始节点录入,都会有workOrderId,这里判断是否有前置组件含有订单号;如果存在订单号,进行订单反填。
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;
369
+ var _tradeIdUniqueKey = hasComponent(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList, 'TRADE_ID_INPUT');
370
+ if (_tradeIdUniqueKey && shopId && record !== null && record !== void 0 && (_record$jsonMap2 = record.jsonMap) !== null && _record$jsonMap2 !== void 0 && _record$jsonMap2["".concat(_tradeIdUniqueKey, "_tradeId")] && firstOrderBackfill) {
371
+ var _record$jsonMap3;
353
372
  orderBack({
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
+ 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")],
355
374
  form: form,
356
375
  shopId: shopId,
357
376
  shopList: shopList,
@@ -523,10 +542,66 @@ var FormRender = function FormRender(props, ref) {
523
542
  fillByShopId(shopId);
524
543
  }, [shopId]);
525
544
 
545
+ // TODO: 标签查询逻辑
546
+ var formShopId = Form.useWatch("shopId", form) || shopId;
547
+ var tradeIdUniqueKey = hasComponent(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, 'TRADE_ID_INPUT');
548
+ var labelUniqueKey = hasComponent(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, 'LABEL');
549
+ useEffect(function () {
550
+ var tid = form.getFieldValue("".concat(tradeIdUniqueKey, "_tradeId"));
551
+ if (!tid) {
552
+ setLabelList([]);
553
+ }
554
+ if (formShopId && tid && labelUniqueKey) {
555
+ queryLabels(tid, formShopId);
556
+ }
557
+ }, [formShopId, tradeIdUniqueKey, labelUniqueKey]);
558
+
559
+ // 查询标签
560
+ var queryLabels = /*#__PURE__*/function () {
561
+ var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(tid, shopId) {
562
+ var _yield$queryLabelByTr, _yield$queryLabelByTr2, data;
563
+ return _regeneratorRuntime().wrap(function _callee2$(_context2) {
564
+ while (1) switch (_context2.prev = _context2.next) {
565
+ case 0:
566
+ if (!isNull(labelComponent)) {
567
+ _context2.next = 2;
568
+ break;
569
+ }
570
+ return _context2.abrupt("return", console.debug('当前节点不需要查询标签'));
571
+ case 2:
572
+ if (shopId) {
573
+ _context2.next = 4;
574
+ break;
575
+ }
576
+ return _context2.abrupt("return", console.debug('查询标签缺少必要参数-shopId'));
577
+ case 4:
578
+ _context2.next = 6;
579
+ return queryLabelByTradeId({
580
+ tid: tid,
581
+ shopId: shopId
582
+ });
583
+ case 6:
584
+ _yield$queryLabelByTr = _context2.sent;
585
+ _yield$queryLabelByTr2 = _yield$queryLabelByTr.data;
586
+ data = _yield$queryLabelByTr2 === void 0 ? [] : _yield$queryLabelByTr2;
587
+ setLabelList(data);
588
+ form.setFieldsValue(_defineProperty({}, "".concat(labelComponent.uniqueKey), data));
589
+ case 11:
590
+ case "end":
591
+ return _context2.stop();
592
+ }
593
+ }, _callee2);
594
+ }));
595
+ return function queryLabels(_x4, _x5) {
596
+ return _ref3.apply(this, arguments);
597
+ };
598
+ }();
599
+
526
600
  //订单返填
527
601
  var changeHandle = function changeHandle(order_no) {
528
602
  if (!order_no) return;
529
603
  console.log('[订单返填 changeHandle order_no ] >', order_no);
604
+ queryLabels(order_no, formShopId);
530
605
  orderBack({
531
606
  order_no: order_no,
532
607
  form: form,
@@ -579,22 +654,22 @@ var FormRender = function FormRender(props, ref) {
579
654
 
580
655
  //组件失焦事件
581
656
  var componentOnBlur = /*#__PURE__*/function () {
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) {
657
+ var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(value, type) {
658
+ return _regeneratorRuntime().wrap(function _callee3$(_context3) {
659
+ while (1) switch (_context3.prev = _context3.next) {
585
660
  case 0:
586
661
  // 针对订单号组件进行当前订单查重校验
587
662
  if ((type === 'tradeId' || type === 'enterprisePaymentTid') && typeof handleChangeTradeId === 'function') {
588
663
  handleChangeTradeId(value);
589
664
  }
590
665
  if (value) {
591
- _context2.next = 4;
666
+ _context3.next = 4;
592
667
  break;
593
668
  }
594
669
  setReplaceValue(function (prev) {
595
670
  return _objectSpread(_objectSpread({}, prev), {}, _defineProperty({}, type, 0));
596
671
  });
597
- return _context2.abrupt("return");
672
+ return _context3.abrupt("return");
598
673
  case 4:
599
674
  queryReplaceCount(_defineProperty({}, type, value), templateDetail);
600
675
  // TODO: ERP不走订单反弹逻辑
@@ -603,12 +678,12 @@ var FormRender = function FormRender(props, ref) {
603
678
  }
604
679
  case 6:
605
680
  case "end":
606
- return _context2.stop();
681
+ return _context3.stop();
607
682
  }
608
- }, _callee2);
683
+ }, _callee3);
609
684
  }));
610
- return function componentOnBlur(_x4, _x5) {
611
- return _ref3.apply(this, arguments);
685
+ return function componentOnBlur(_x6, _x7) {
686
+ return _ref4.apply(this, arguments);
612
687
  };
613
688
  }();
614
689
  // 切换店铺
@@ -759,7 +834,7 @@ var FormRender = function FormRender(props, ref) {
759
834
  };
760
835
  var newRenderColumnItem = function newRenderColumnItem(effects) {
761
836
  return function (item) {
762
- var _componentConfig$stat, _componentConfig$stat2;
837
+ var _componentConfig$stat, _componentConfig$stat2, _templateDetail$flowT2;
763
838
  var _item$componentConfig2 = item.componentConfig,
764
839
  componentConfig = _item$componentConfig2 === void 0 ? {} : _item$componentConfig2,
765
840
  workOrderComponentType = item.workOrderComponentType,
@@ -814,6 +889,7 @@ var FormRender = function FormRender(props, ref) {
814
889
  }),
815
890
  type: workOrderComponentType,
816
891
  templateId: templateDetail.uniqueKey,
892
+ flowTemplateKey: (_templateDetail$flowT2 = templateDetail.flowTemplateConfig) === null || _templateDetail$flowT2 === void 0 ? void 0 : _templateDetail$flowT2.flowTemplateKey,
817
893
  workOrderUniqueKey: record === null || record === void 0 ? void 0 : record.id,
818
894
  platform: platform
819
895
  });
@@ -826,8 +902,8 @@ var FormRender = function FormRender(props, ref) {
826
902
  shouldUpdate: function shouldUpdate() {
827
903
  return true; // TODO: 修复重复依赖的问题 https://tb.raycloud.com/task/64e4491e0b8b5c001e1099b9
828
904
  }
829
- }, function (_ref4) {
830
- var getFieldValue = _ref4.getFieldValue;
905
+ }, function (_ref5) {
906
+ var getFieldValue = _ref5.getFieldValue;
831
907
  var show = currentIdDependenceOtherFields === null || currentIdDependenceOtherFields === void 0 ? void 0 : currentIdDependenceOtherFields.reduce(function (cur, nxt) {
832
908
  // 如果有一项满足展示条件则展示
833
909
  if (cur) {
@@ -919,8 +995,8 @@ var FormRender = function FormRender(props, ref) {
919
995
  }, [platform, templateDetail, shopList, shopId, record, mappdingHideComponents, currentShopId, look, handleChangeTradeId, innerReplaceValue]);
920
996
  // TODO: 计算类型组件列表
921
997
  var calculationTypeComponentList = useMemo(function () {
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) {
998
+ var _templateDetail$compo2;
999
+ return templateDetail === null || templateDetail === void 0 ? void 0 : (_templateDetail$compo2 = templateDetail.componentDtoList) === null || _templateDetail$compo2 === void 0 ? void 0 : _templateDetail$compo2.filter(function (item) {
924
1000
  return item.workOrderComponentType === 'NUMERICAL_CALCULATION';
925
1001
  });
926
1002
  }, [templateDetail]);
@@ -944,10 +1020,10 @@ var FormRender = function FormRender(props, ref) {
944
1020
  //如果是初始化创建工单 缓存信息
945
1021
  if (!workOrderId && ['fxg', 'tb', 'ks', 'xiaozhi'].includes(plat.platform)) {
946
1022
  var _tempLateList$find;
947
- var tradeIdUniqueKey = (_tempLateList$find = tempLateList.find(function (item) {
1023
+ var _tradeIdUniqueKey2 = (_tempLateList$find = tempLateList.find(function (item) {
948
1024
  return item.workOrderComponentType === 'TRADE_ID_INPUT';
949
1025
  })) === null || _tempLateList$find === void 0 ? void 0 : _tempLateList$find.uniqueKey;
950
- var tradeId = value[tradeIdUniqueKey];
1026
+ var tradeId = value[_tradeIdUniqueKey2];
951
1027
  if (plat !== null && plat !== void 0 && plat.subOrderNo) {
952
1028
  var cacheOmsOrderInfo = JSON.parse(sessionStorage.getItem('cacheOmsOrderInfo') || '{}');
953
1029
  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)))));
@@ -1018,6 +1094,20 @@ var FormRender = function FormRender(props, ref) {
1018
1094
  className: "tipBox"
1019
1095
  }, Object.keys(filterReplaceValue).map(function (key) {
1020
1096
  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");
1097
+ })), (labelList === null || labelList === void 0 ? void 0 : labelList.length) > 0 && /*#__PURE__*/React.createElement(Space, {
1098
+ wrap: true,
1099
+ style: {
1100
+ marginBottom: '8px'
1101
+ }
1102
+ }, labelList === null || labelList === void 0 ? void 0 : labelList.map(function (l) {
1103
+ var _LabelData$getInstanc;
1104
+ var label = ((_LabelData$getInstanc = LabelData.getInstance().labelData) === null || _LabelData$getInstanc === void 0 ? void 0 : _LabelData$getInstanc.find(function (item) {
1105
+ return item.value === (l === null || l === void 0 ? void 0 : l.labelShowName);
1106
+ })) || {};
1107
+ if (!isNull(label)) return /*#__PURE__*/React.createElement(Tag, {
1108
+ color: label === null || label === void 0 ? void 0 : label.color
1109
+ }, label === null || label === void 0 ? void 0 : label.label);
1110
+ return null;
1021
1111
  })), /*#__PURE__*/React.createElement(Form, _extends({
1022
1112
  form: preNodeForm
1023
1113
  }, formProps), preNodeFormItems), /*#__PURE__*/React.createElement(Form, _extends({
@@ -26,8 +26,12 @@ 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 } from "../../../model/flowTemplateDetail/api";
30
- import { setAction, setWithdrawWorkOrderDetail, setNodeAssistantInfo } from "../../../model/flowTemplateDetail";
29
+ import { queryNodeDetail, queryMultiNodeAssistantInfo
30
+ // queryLabelByTradeId
31
+ } from "../../../model/flowTemplateDetail/api";
32
+ import { setAction, setWithdrawWorkOrderDetail, setNodeAssistantInfo
33
+ // setLabelList
34
+ } from "../../../model/flowTemplateDetail";
31
35
  import { selectPlatInfo, selectFlowStatus, selectCurrentFlowAllShowHideRules, selectNodeAssistantMap } from "../../../model/flowTemplateDetail/selector";
32
36
  import { FlowStatus, NodeType } from "../../../model/flowTemplateDetail/types";
33
37
  import { modifyWorkOrder } from "../../../model/flowTemplateDetail/api";
@@ -234,6 +238,16 @@ var NodeItem = function NodeItem(props) {
234
238
  // 撤回按钮展示逻辑
235
239
  // todo: 人工节点 + 节点权限 + 后续节点是否有人工节点或者自动化任务
236
240
  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
+ // };
237
251
  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) || []))),
238
252
  _calcWorkOrderList2 = _slicedToArray(_calcWorkOrderList, 1),
239
253
  transData = _calcWorkOrderList2[0];
@@ -276,6 +290,7 @@ var NodeItem = function NodeItem(props) {
276
290
  canModifyPayment: false,
277
291
  flowAllShowHideRules: allShowHideRules,
278
292
  firstOrderBackfill: false // TODO: 前面节点必然是已完成状态,已完成状态不再调用订单反填
293
+ // handleChangeTradeId={handleChangeTradeId}
279
294
  }) : /*#__PURE__*/React.createElement(RenderDetail, {
280
295
  workOrderTemplateInfo: data === null || data === void 0 ? void 0 : (_data$data19 = data.data) === null || _data$data19 === void 0 ? void 0 : _data$data19.workOrderTemplateInfo,
281
296
  transData: transData,
@@ -21,7 +21,9 @@ 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 } from "../model/flowTemplateDetail";
24
+ import { setPlat, fetchPanelInfo, fetchAllFlowOperateRecord, setAction, setVisibleRemarkList, setAddRemarkVisible, setLoading, setClearStore
25
+ // setLabelList
26
+ } from "../model/flowTemplateDetail";
25
27
  import { selectFlowRecordList, selectRemarkRecordList, selectCurrentNodeDetail, selectTid, selectShopUniqueKey, selectOperateParams, selectFlowStatus, selectCurrentTradeIdWOrkOrderNumber, selectFlowTemplateId, selectLoading, selectWithDrawOrder, selectNodeAssistantMap, selectFlowTemplateType } from "../model/flowTemplateDetail/selector";
26
28
  import { NodeType, FlowStatus, FlowType } from "../model/flowTemplateDetail/types";
27
29
  import NodeItem from "./components/Item";
@@ -983,9 +985,10 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
983
985
  }, /*#__PURE__*/React.createElement("div", {
984
986
  className: "flowWorkOrderDetail"
985
987
  }, flowStatus && /*#__PURE__*/React.createElement(Row, {
986
- justify: 'space-between'
987
- }, /*#__PURE__*/React.createElement(Col, null, /*#__PURE__*/React.createElement("div", {
988
+ justify: 'space-between',
988
989
  className: "header"
990
+ }, /*#__PURE__*/React.createElement(Col, null, /*#__PURE__*/React.createElement("div", {
991
+ className: "statusWrap"
989
992
  }, "\u6D41\u7A0B\u72B6\u6001\uFF1A", /*#__PURE__*/React.createElement("div", {
990
993
  className: "status ".concat(flowStatus)
991
994
  }), /*#__PURE__*/React.createElement("span", null, FLOW_STATUS_V2[flowStatus]))), flowTemplateType !== 'SINGLE_PAGE' && /*#__PURE__*/React.createElement(Col, {
@@ -6,16 +6,19 @@
6
6
  width: 200px
7
7
  }
8
8
  .header {
9
- display: flex;
10
- align-items: center;
11
9
  background: #FFF;
12
10
  height: 24px;
13
11
  width: 100%;
14
12
  margin-bottom: 8px;
15
13
  box-sizing: content-box;
16
- z-index: 2;
17
- > span {
18
- margin-left: 8px;
14
+ z-index: 99;
15
+ padding: 8px;
16
+ .statusWrap {
17
+ display: flex;
18
+ align-items: center;
19
+ > span {
20
+ margin-left: 8px;
21
+ }
19
22
  }
20
23
  .status {
21
24
  width: 8px;
@@ -330,7 +330,7 @@ var FormRender = function FormRender(props, ref) {
330
330
  //查询重复数量
331
331
  var queryReplaceCount = /*#__PURE__*/function () {
332
332
  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(componentValue, templateDetail) {
333
- var needCheckComponentList, params, _yield$replaceCheck, resultList, resultParams;
333
+ var needCheckComponentList, _templateDetail$flowT3, params, _yield$replaceCheck, resultList, resultParams;
334
334
  return _regeneratorRuntime().wrap(function _callee2$(_context2) {
335
335
  while (1) switch (_context2.prev = _context2.next) {
336
336
  case 0:
@@ -343,6 +343,7 @@ var FormRender = function FormRender(props, ref) {
343
343
  break;
344
344
  }
345
345
  params = {
346
+ flowTemplateKey: (_templateDetail$flowT3 = templateDetail.flowTemplateConfig) === null || _templateDetail$flowT3 === void 0 ? void 0 : _templateDetail$flowT3.flowTemplateKey,
346
347
  templateId: templateDetail.uniqueKey,
347
348
  workOrderUniqueKey: workOrderDetail === null || workOrderDetail === void 0 ? void 0 : workOrderDetail.uniqueKey,
348
349
  needCheckComponentList: needCheckComponentList
@@ -323,7 +323,7 @@ var FormRender = function FormRender(props, ref) {
323
323
  //查询重复数量
324
324
  var queryReplaceCount = /*#__PURE__*/function () {
325
325
  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(componentValue, templateDetail) {
326
- var needCheckComponentList, params, _yield$replaceCheck, resultList, resultParams;
326
+ var needCheckComponentList, _templateDetail$flowT, params, _yield$replaceCheck, resultList, resultParams;
327
327
  return _regeneratorRuntime().wrap(function _callee2$(_context2) {
328
328
  while (1) switch (_context2.prev = _context2.next) {
329
329
  case 0:
@@ -336,6 +336,7 @@ var FormRender = function FormRender(props, ref) {
336
336
  break;
337
337
  }
338
338
  params = {
339
+ flowTemplateKey: (_templateDetail$flowT = templateDetail.flowTemplateConfig) === null || _templateDetail$flowT === void 0 ? void 0 : _templateDetail$flowT.flowTemplateKey,
339
340
  templateId: templateDetail.uniqueKey,
340
341
  workOrderUniqueKey: workOrderDetail === null || workOrderDetail === void 0 ? void 0 : workOrderDetail.uniqueKey,
341
342
  needCheckComponentList: needCheckComponentList
@@ -307,7 +307,7 @@ var CustomizeFormModal = function CustomizeFormModal(props) {
307
307
  //查询重复数量
308
308
  var queryReplaceCount = /*#__PURE__*/function () {
309
309
  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(componentValue) {
310
- var needCheckComponentList, params, _yield$replaceCheck, resultList, resultParams;
310
+ var needCheckComponentList, _templateDetail$flowT, params, _yield$replaceCheck, resultList, resultParams;
311
311
  return _regeneratorRuntime().wrap(function _callee3$(_context3) {
312
312
  while (1) switch (_context3.prev = _context3.next) {
313
313
  case 0:
@@ -320,6 +320,7 @@ var CustomizeFormModal = function CustomizeFormModal(props) {
320
320
  break;
321
321
  }
322
322
  params = {
323
+ flowTemplateKey: (_templateDetail$flowT = templateDetail.flowTemplateConfig) === null || _templateDetail$flowT === void 0 ? void 0 : _templateDetail$flowT.flowTemplateKey,
323
324
  templateId: templateDetail.uniqueKey,
324
325
  workOrderUniqueKey: workOrderDetail === null || workOrderDetail === void 0 ? void 0 : workOrderDetail.uniqueKey,
325
326
  needCheckComponentList: needCheckComponentList
@@ -1610,6 +1610,9 @@ var transDataSource = function transDataSource(templateColumns) {
1610
1610
  shopCode: item.jsonMap["".concat(nex.uniqueKey, "_shopCode")],
1611
1611
  wdtSystemOrderNo: item.jsonMap["".concat(nex.uniqueKey, "_wdtSystemOrderNo")]
1612
1612
  }));
1613
+ } else if (nex.workOrderComponentType === 'LABEL') {
1614
+ var _objectSpread54;
1615
+ return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread54 = {}, _defineProperty(_objectSpread54, "".concat(nex.uniqueKey), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_label")], [])), _defineProperty(_objectSpread54, "".concat(nex.uniqueKey, "_label"), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_label")], [])), _objectSpread54));
1613
1616
  }
1614
1617
  }, {});
1615
1618
  };
@@ -1631,7 +1634,7 @@ export var calcWorkOrderList = function calcWorkOrderList(source, templateColumn
1631
1634
  //订单返填
1632
1635
  export var orderBack = /*#__PURE__*/function () {
1633
1636
  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
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;
1637
+ 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, _objectSpread56, _cacheOrderInfo;
1635
1638
  return _regeneratorRuntime().wrap(function _callee$(_context) {
1636
1639
  while (1) switch (_context.prev = _context.next) {
1637
1640
  case 0:
@@ -1870,7 +1873,7 @@ export var orderBack = /*#__PURE__*/function () {
1870
1873
  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))))));
1871
1874
  } else {
1872
1875
  _cacheOrderInfo = JSON.parse(sessionStorage.getItem('cacheOrderInfo') || '{}');
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))));
1876
+ sessionStorage.setItem('cacheOrderInfo', JSON.stringify(_objectSpread(_objectSpread({}, _cacheOrderInfo), {}, (_objectSpread56 = {}, _defineProperty(_objectSpread56, order_no, values), _defineProperty(_objectSpread56, "".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId), _defineProperty({}, order_no, _objectSpread(_objectSpread({}, formValue), values))), _objectSpread56))));
1874
1877
  }
1875
1878
  }
1876
1879
  // console.log('orderback', values);
@@ -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">;
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">;
14
14
  declare const _default: import("redux").Reducer<FlowTemplateDetailState, import("redux").AnyAction>;
15
15
  export default _default;
@@ -40,7 +40,8 @@ export var initialState = {
40
40
  },
41
41
  tid: '',
42
42
  shopUniqueKey: '',
43
- flowTemplateType: ''
43
+ flowTemplateType: '',
44
+ labelList: []
44
45
  };
45
46
  export var fetchPanelInfo = function fetchPanelInfo(params, options) {
46
47
  return /*#__PURE__*/function () {
@@ -314,6 +315,13 @@ var slice = createSlice({
314
315
  setFlowTemplateType: function setFlowTemplateType(state, _ref22) {
315
316
  var payload = _ref22.payload;
316
317
  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 = [];
317
325
  }
318
326
  }
319
327
  });
@@ -336,6 +344,8 @@ var _slice$actions = slice.actions,
336
344
  setCurrentFlowAllShowHideRules = _slice$actions.setCurrentFlowAllShowHideRules,
337
345
  setClearStore = _slice$actions.setClearStore,
338
346
  setWithdrawWorkOrderDetail = _slice$actions.setWithdrawWorkOrderDetail,
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 };
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 };
341
351
  export default slice.reducer;
@@ -698,3 +698,17 @@ 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,4 +57,7 @@ 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;
60
63
  });
@@ -61,6 +61,7 @@ export interface FlowTemplateDetailState {
61
61
  tid: string;
62
62
  shopUniqueKey: string;
63
63
  flowTemplateType: FlowType;
64
+ labelList: Array<string>;
64
65
  }
65
66
  export interface QyFlowPanelInfoRequest {
66
67
  /**
@@ -76,4 +76,7 @@ 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
+ }>>>;
79
82
  export declare const createWdtReissueOrder: <REQ = any, RES = any>(data: REQ) => Promise<serverProps<RES>>;
@@ -488,6 +488,14 @@ 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
+ };
491
499
  // wdt 创建补发单
492
500
  export var createWdtReissueOrder = function createWdtReissueOrder(data) {
493
501
  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.2.0",
3
+ "version": "1.3.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.2.0",
36
- "@kmkf-fe-packages/kmkf-utils": "1.2.0",
37
- "@kmkf-fe-packages/services-components": "1.2.0",
35
+ "@kmkf-fe-packages/basic-components": "1.3.0",
36
+ "@kmkf-fe-packages/kmkf-utils": "1.3.0",
37
+ "@kmkf-fe-packages/services-components": "1.3.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": "b14fc34f8d5d1d37484367f2a09782c4f9d065cb",
76
+ "gitHead": "227e5e52ad4e85074c0486fea308033557d75a6e",
77
77
  "gitHooks": {
78
78
  "pre-commit": "lint-staged"
79
79
  }