@kmkf-fe-packages/kmkf-work-order-service-component 1.2.0 → 1.3.0-rc.0

package/README.md

@@ -38,7 +38,6 @@ Build library via `father`,
 ```bash
 $ npm run build
 ```
-
 11122
 
 ## 企业工单工单项目抽离模块
@@ -64,5 +63,5 @@ const Text = ()=>{
 
 ```
 
-| 字段 | 说明 | 数据类型 | | ----------------- | ---------------- | ------------------------------------ | | platform | 平台 | TAOBAO =淘宝\|FXG=抖音\|PDD=拼多多\| | | shopId | 店铺 ID | number | | buyerNick | 买家昵称 | string | | buyerId | 买家 id | string | | orderNo | 订单 id | string | | onEmpowerCallback | 授权弹框点击回调 | function |
+| 字段 | 说明 | 数据类型 | | ----------------- | ---------------- | ------------------------------------ | | platform | 平台 | TAOBAO =淘宝\|FXG=抖音\|PDD=拼多多\| | | shopId | 店铺 ID | number | | buyerNick | 买家昵称 | string | | buyerId | 买家 id | string | | orderNo | 订单 id | string | | onEmpowerCallback | 授权弹框点击回调 | function | 
 

package/dist/esm/FlowTemplateDetail/components/FormRender/index.js

@@ -22,22 +22,23 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useState, useRef, useEffect, useMemo, forwardRef, useImperativeHandle } from 'react';
-import { ConfigProvider, Form } from 'antd';
+import { ConfigProvider, Form, Space, Tag } from 'antd';
 import zhCN from 'antd/es/locale/zh_CN';
 import { get, some, set, every, cloneDeep, isEmpty, intersection, throttle } from 'lodash';
 import 'moment/locale/zh-cn';
 import { calcWorkOrderList, orderBack, getReplaceWarnValues, COMPONENT_MAP_NAME, EXCLUDE_REPLACE_TOP_COMPONENT,
 // 重复检验不需要展示在顶部的
 INNER_REPLACE_COMPONENT, reversalFormValues, bsSystemOrderBackValues, wlnSystemOrderBackValues, getMappingConfigByTemplateDetail, wdtSystemOrderBackValues, setLogisticsInfo } from "../../../common/utils/tools";
-import { replaceCheck, orderDetail } from "../../../model/servers/api";
+import { replaceCheck, orderDetail, queryLabelByTradeId } from "../../../model/servers/api";
 import { factory } from '@kmkf-fe-packages/services-components';
-import { getExpression, formatDisplayConfig, isNull } from '@kmkf-fe-packages/kmkf-utils';
+import { getExpression, formatDisplayConfig, isNull, LabelData } from '@kmkf-fe-packages/kmkf-utils';
 import ShopName from "../ShopName";
 import { PlatForm } from "../../../model/flowTemplateDetail/types";
 import { groupByPreNode, getCurrentNodeModifiedShowHideRule } from "./common";
 import { getCalculationComponentValue } from "../../../common/utils/arithmetic";
 import "./index.less";
 import { CHILD_FIELD_TYPE, CHILD_FIELD_VALUE } from "../../../common/constant";
+import { jsonParseSecurity } from "../../../common/utils/tools";
 var hasComponent = function hasComponent(componentDtoList, workOrderComponentType) {
   var _componentDtoList$fin;
   return (_componentDtoList$fin = componentDtoList.find(function (item) {
@@ -111,10 +112,14 @@ var FormRender = function FormRender(props, ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     replaceValue = _useState4[0],
     setReplaceValue = _useState4[1]; //字段重复校验
-  var _useState5 = useState(currentShopId),
+  var _useState5 = useState([]),
     _useState6 = _slicedToArray(_useState5, 2),
-    shopId = _useState6[0],
-    setShopId = _useState6[1];
+    labelList = _useState6[0],
+    setLabelList = _useState6[1];
+  var _useState7 = useState(currentShopId),
+    _useState8 = _slicedToArray(_useState7, 2),
+    shopId = _useState8[0],
+    setShopId = _useState8[1];
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     preNodeForm = _Form$useForm2[0];
@@ -127,6 +132,13 @@ var FormRender = function FormRender(props, ref) {
   var currentComponentDisplayStatus = useRef({});
   // TODO：所有组件显影标志
   var currentTemplateAllComponentsDisplay = useRef({});
+  // TODO: 标签组件
+  var labelComponent = useMemo(function () {
+    var _templateDetail$compo;
+    return templateDetail === null || templateDetail === void 0 ? void 0 : (_templateDetail$compo = templateDetail.componentDtoList) === null || _templateDetail$compo === void 0 ? void 0 : _templateDetail$compo.find(function (item) {
+      return item.workOrderComponentType === 'LABEL';
+    });
+  }, [templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList]);
   // TODO: 前置节点form单独设置指
   useEffect(function () {
     if (!isEmpty(record)) {
@@ -190,7 +202,7 @@ var FormRender = function FormRender(props, ref) {
   //查询重复数量
   var queryReplaceCount = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(componentValue, templateDetail) {
-      var needCheckComponentList, params, _yield$replaceCheck, resultList, resultParams;
+      var needCheckComponentList, _templateDetail$flowT, params, _yield$replaceCheck, resultList, resultParams;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -203,6 +215,7 @@ var FormRender = function FormRender(props, ref) {
               break;
             }
             params = {
+              flowTemplateKey: (_templateDetail$flowT = templateDetail.flowTemplateConfig) === null || _templateDetail$flowT === void 0 ? void 0 : _templateDetail$flowT.flowTemplateKey,
               templateId: templateDetail.uniqueKey,
               workOrderUniqueKey: record === null || record === void 0 ? void 0 : record.uniqueKey,
               needCheckComponentList: needCheckComponentList
@@ -292,6 +305,12 @@ var FormRender = function FormRender(props, ref) {
       enterprisePaymentAlipayNo: enterprisePaymentAlipayNo
     }, templateDetail);
   };
+  useEffect(function () {
+    if (labelComponent && !isNull(record)) {
+      var _record$jsonMap;
+      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")], []));
+    }
+  }, [labelComponent, record]);
   var queryDetail = function queryDetail(_ref2) {
     var workOrderId = _ref2.workOrderId,
       shopId = _ref2.shopId,
@@ -318,7 +337,7 @@ var FormRender = function FormRender(props, ref) {
       return prv;
     }, {});
     if (workOrderId) {
-      var _record$jsonMap;
+      var _record$jsonMap2;
       // 先初始化端上内容
       var newRecord = cloneDeep(record);
       var jsonMapOrderId = Object.keys(newRecord.jsonMap).reduce(function (prv, next) {
@@ -347,11 +366,11 @@ var FormRender = function FormRender(props, ref) {
       batchFillByMapping(initialValues);
       orderBackReplace(transData, templateDetail);
       // TODO: 非开始节点录入，都会有workOrderId,这里判断是否有前置组件含有订单号；如果存在订单号，进行订单反填。
-      var tradeIdUniqueKey = hasComponent(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList, 'TRADE_ID_INPUT');
-      if (tradeIdUniqueKey && shopId && record !== null && record !== void 0 && (_record$jsonMap = record.jsonMap) !== null && _record$jsonMap !== void 0 && _record$jsonMap["".concat(tradeIdUniqueKey, "_tradeId")] && firstOrderBackfill) {
-        var _record$jsonMap2;
+      var _tradeIdUniqueKey = hasComponent(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList, 'TRADE_ID_INPUT');
+      if (_tradeIdUniqueKey && shopId && record !== null && record !== void 0 && (_record$jsonMap2 = record.jsonMap) !== null && _record$jsonMap2 !== void 0 && _record$jsonMap2["".concat(_tradeIdUniqueKey, "_tradeId")] && firstOrderBackfill) {
+        var _record$jsonMap3;
         orderBack({
-          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")],
+          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")],
           form: form,
           shopId: shopId,
           shopList: shopList,
@@ -523,10 +542,66 @@ var FormRender = function FormRender(props, ref) {
     fillByShopId(shopId);
   }, [shopId]);
 
+  // TODO: 标签查询逻辑
+  var formShopId = Form.useWatch("shopId", form) || shopId;
+  var tradeIdUniqueKey = hasComponent(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, 'TRADE_ID_INPUT');
+  var labelUniqueKey = hasComponent(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, 'LABEL');
+  useEffect(function () {
+    var tid = form.getFieldValue("".concat(tradeIdUniqueKey, "_tradeId"));
+    if (!tid) {
+      setLabelList([]);
+    }
+    if (formShopId && tid && labelUniqueKey) {
+      queryLabels(tid, formShopId);
+    }
+  }, [formShopId, tradeIdUniqueKey, labelUniqueKey]);
+
+  // 查询标签
+  var queryLabels = /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(tid, shopId) {
+      var _yield$queryLabelByTr, _yield$queryLabelByTr2, data;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            if (!isNull(labelComponent)) {
+              _context2.next = 2;
+              break;
+            }
+            return _context2.abrupt("return", console.debug('当前节点不需要查询标签'));
+          case 2:
+            if (shopId) {
+              _context2.next = 4;
+              break;
+            }
+            return _context2.abrupt("return", console.debug('查询标签缺少必要参数-shopId'));
+          case 4:
+            _context2.next = 6;
+            return queryLabelByTradeId({
+              tid: tid,
+              shopId: shopId
+            });
+          case 6:
+            _yield$queryLabelByTr = _context2.sent;
+            _yield$queryLabelByTr2 = _yield$queryLabelByTr.data;
+            data = _yield$queryLabelByTr2 === void 0 ? [] : _yield$queryLabelByTr2;
+            setLabelList(data);
+            form.setFieldsValue(_defineProperty({}, "".concat(labelComponent.uniqueKey), data));
+          case 11:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function queryLabels(_x4, _x5) {
+      return _ref3.apply(this, arguments);
+    };
+  }();
+
   //订单返填
   var changeHandle = function changeHandle(order_no) {
     if (!order_no) return;
     console.log('[订单返填 changeHandle order_no ] >', order_no);
+    queryLabels(order_no, formShopId);
     orderBack({
       order_no: order_no,
       form: form,
@@ -579,22 +654,22 @@ var FormRender = function FormRender(props, ref) {
 
   //组件失焦事件
   var componentOnBlur = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(value, type) {
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(value, type) {
+      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
           case 0:
             // 针对订单号组件进行当前订单查重校验
             if ((type === 'tradeId' || type === 'enterprisePaymentTid') && typeof handleChangeTradeId === 'function') {
               handleChangeTradeId(value);
             }
             if (value) {
-              _context2.next = 4;
+              _context3.next = 4;
               break;
             }
             setReplaceValue(function (prev) {
               return _objectSpread(_objectSpread({}, prev), {}, _defineProperty({}, type, 0));
             });
-            return _context2.abrupt("return");
+            return _context3.abrupt("return");
           case 4:
             queryReplaceCount(_defineProperty({}, type, value), templateDetail);
             // TODO: ERP不走订单反弹逻辑
@@ -603,12 +678,12 @@ var FormRender = function FormRender(props, ref) {
             }
           case 6:
           case "end":
-            return _context2.stop();
+            return _context3.stop();
         }
-      }, _callee2);
+      }, _callee3);
     }));
-    return function componentOnBlur(_x4, _x5) {
-      return _ref3.apply(this, arguments);
+    return function componentOnBlur(_x6, _x7) {
+      return _ref4.apply(this, arguments);
     };
   }();
   // 切换店铺
@@ -616,7 +691,7 @@ var FormRender = function FormRender(props, ref) {
     setShopId(val);
     // 清空表单字段
     var needClearFormFields = get(templateDetail, 'componentDtoList', []).reduce(function (cur, nxt) {
-      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)) {
+      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)) {
         cur.push(nxt === null || nxt === void 0 ? void 0 : nxt.uniqueKey);
       }
       return cur;
@@ -718,7 +793,7 @@ var FormRender = function FormRender(props, ref) {
     });
   };
   var conditionItemResult = function conditionItemResult(item, getFieldValue) {
-    var _item$leftValue$split, _item$leftValue$split2, _item$compareSymbol;
+    var _item$leftValue$split, _item$leftValue$split2, _dependenceDetail2, _item$compareSymbol, _item$compareSymbol2;
     //现支持子组件控制显隐，格式为${uniqueKey}_${type}与普通组件做区分
     var isChildField = item.leftValue.includes('_');
     var prefixId = isChildField ? (_item$leftValue$split = item.leftValue.split('_')) === null || _item$leftValue$split === void 0 ? void 0 : _item$leftValue$split[0] : item.leftValue;
@@ -741,7 +816,8 @@ var FormRender = function FormRender(props, ref) {
     if (Reflect.has(currentComponentDisplayStatus.current, prefixId) && !currentComponentDisplayStatus.current[prefixId]) {
       return false;
     }
-    return getExpression((_item$compareSymbol = item.compareSymbol) === null || _item$compareSymbol === void 0 ? void 0 : _item$compareSymbol.toUpperCase(), leftValue, item.rightValue);
+    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);
+    return getExpression((_item$compareSymbol2 = item.compareSymbol) === null || _item$compareSymbol2 === void 0 ? void 0 : _item$compareSymbol2.toUpperCase(), leftValue, item.rightValue);
   };
   var getDisplayAndDisabledConfig = function getDisplayAndDisabledConfig(config) {
     if (isNull(config)) {
@@ -759,7 +835,7 @@ var FormRender = function FormRender(props, ref) {
   };
   var newRenderColumnItem = function newRenderColumnItem(effects) {
     return function (item) {
-      var _componentConfig$stat, _componentConfig$stat2;
+      var _templateDetail$flowT2;
       var _item$componentConfig2 = item.componentConfig,
         componentConfig = _item$componentConfig2 === void 0 ? {} : _item$componentConfig2,
         workOrderComponentType = item.workOrderComponentType,
@@ -773,7 +849,19 @@ var FormRender = function FormRender(props, ref) {
       var newComponentConfig = _objectSpread(_objectSpread({}, componentConfig), {}, {
         disabled: disabled
       });
-      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),
+      var _ref5 = (componentConfig === null || componentConfig === void 0 ? void 0 : componentConfig.status) || {},
+        upgrade = _ref5.upgrade,
+        created = _ref5.created;
+      if (['REISSUE_TRADE_ID', 'EXCHANGE_TRADE_ID'].includes(workOrderComponentType)) {
+        // 补发单id和换货单id默认值是可见不可编辑（2）
+        if (typeof upgrade !== 'number') {
+          upgrade = 2;
+        }
+        if (typeof created !== 'number') {
+          created = 2;
+        }
+      }
+      var _getDisplayAndDisable = getDisplayAndDisabledConfig(workOrderId ? upgrade : created),
         componentCanEdit = _getDisplayAndDisable.disabled,
         componentCanShow = _getDisplayAndDisable.display;
       // TODO: 非前置节点组件渲染消费是否可以编辑配置
@@ -814,6 +902,7 @@ var FormRender = function FormRender(props, ref) {
         }),
         type: workOrderComponentType,
         templateId: templateDetail.uniqueKey,
+        flowTemplateKey: (_templateDetail$flowT2 = templateDetail.flowTemplateConfig) === null || _templateDetail$flowT2 === void 0 ? void 0 : _templateDetail$flowT2.flowTemplateKey,
         workOrderUniqueKey: record === null || record === void 0 ? void 0 : record.id,
         platform: platform
       });
@@ -826,8 +915,8 @@ var FormRender = function FormRender(props, ref) {
           shouldUpdate: function shouldUpdate() {
             return true; // TODO: 修复重复依赖的问题 https://tb.raycloud.com/task/64e4491e0b8b5c001e1099b9
           }
-        }, function (_ref4) {
-          var getFieldValue = _ref4.getFieldValue;
+        }, function (_ref6) {
+          var getFieldValue = _ref6.getFieldValue;
           var show = currentIdDependenceOtherFields === null || currentIdDependenceOtherFields === void 0 ? void 0 : currentIdDependenceOtherFields.reduce(function (cur, nxt) {
             // 如果有一项满足展示条件则展示
             if (cur) {
@@ -919,8 +1008,8 @@ var FormRender = function FormRender(props, ref) {
   }, [platform, templateDetail, shopList, shopId, record, mappdingHideComponents, currentShopId, look, handleChangeTradeId, innerReplaceValue]);
   // TODO: 计算类型组件列表
   var calculationTypeComponentList = useMemo(function () {
-    var _templateDetail$compo;
-    return templateDetail === null || templateDetail === void 0 ? void 0 : (_templateDetail$compo = templateDetail.componentDtoList) === null || _templateDetail$compo === void 0 ? void 0 : _templateDetail$compo.filter(function (item) {
+    var _templateDetail$compo2;
+    return templateDetail === null || templateDetail === void 0 ? void 0 : (_templateDetail$compo2 = templateDetail.componentDtoList) === null || _templateDetail$compo2 === void 0 ? void 0 : _templateDetail$compo2.filter(function (item) {
       return item.workOrderComponentType === 'NUMERICAL_CALCULATION';
     });
   }, [templateDetail]);
@@ -944,10 +1033,10 @@ var FormRender = function FormRender(props, ref) {
     //如果是初始化创建工单 缓存信息
     if (!workOrderId && ['fxg', 'tb', 'ks', 'xiaozhi'].includes(plat.platform)) {
       var _tempLateList$find;
-      var tradeIdUniqueKey = (_tempLateList$find = tempLateList.find(function (item) {
+      var _tradeIdUniqueKey2 = (_tempLateList$find = tempLateList.find(function (item) {
         return item.workOrderComponentType === 'TRADE_ID_INPUT';
       })) === null || _tempLateList$find === void 0 ? void 0 : _tempLateList$find.uniqueKey;
-      var tradeId = value[tradeIdUniqueKey];
+      var tradeId = value[_tradeIdUniqueKey2];
       if (plat !== null && plat !== void 0 && plat.subOrderNo) {
         var cacheOmsOrderInfo = JSON.parse(sessionStorage.getItem('cacheOmsOrderInfo') || '{}');
         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 +1107,20 @@ var FormRender = function FormRender(props, ref) {
     className: "tipBox"
   }, Object.keys(filterReplaceValue).map(function (key) {
     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");
+  })), (labelList === null || labelList === void 0 ? void 0 : labelList.length) > 0 && /*#__PURE__*/React.createElement(Space, {
+    wrap: true,
+    style: {
+      marginBottom: '8px'
+    }
+  }, labelList === null || labelList === void 0 ? void 0 : labelList.map(function (l) {
+    var _LabelData$getInstanc;
+    var label = ((_LabelData$getInstanc = LabelData.getInstance().labelData) === null || _LabelData$getInstanc === void 0 ? void 0 : _LabelData$getInstanc.find(function (item) {
+      return item.value === (l === null || l === void 0 ? void 0 : l.labelShowName);
+    })) || {};
+    if (!isNull(label)) return /*#__PURE__*/React.createElement(Tag, {
+      color: label === null || label === void 0 ? void 0 : label.color
+    }, label === null || label === void 0 ? void 0 : label.label);
+    return null;
   })), /*#__PURE__*/React.createElement(Form, _extends({
     form: preNodeForm
   }, formProps), preNodeFormItems), /*#__PURE__*/React.createElement(Form, _extends({

package/dist/esm/FlowTemplateDetail/components/Item/index.js

@@ -26,8 +26,12 @@ import Header from "../Header";
 import FormRender from "../FormRender";
 import RenderDetail from "../RenderDetail";
 import { calcWorkOrderList } from "../../../common/utils/tools";
-import { queryNodeDetail, queryMultiNodeAssistantInfo } from "../../../model/flowTemplateDetail/api";
-import { setAction, setWithdrawWorkOrderDetail, setNodeAssistantInfo } from "../../../model/flowTemplateDetail";
+import { queryNodeDetail, queryMultiNodeAssistantInfo
+// queryLabelByTradeId
+} from "../../../model/flowTemplateDetail/api";
+import { setAction, setWithdrawWorkOrderDetail, setNodeAssistantInfo
+// setLabelList
+} from "../../../model/flowTemplateDetail";
 import { selectPlatInfo, selectFlowStatus, selectCurrentFlowAllShowHideRules, selectNodeAssistantMap } from "../../../model/flowTemplateDetail/selector";
 import { FlowStatus, NodeType } from "../../../model/flowTemplateDetail/types";
 import { modifyWorkOrder } from "../../../model/flowTemplateDetail/api";
@@ -234,6 +238,16 @@ var NodeItem = function NodeItem(props) {
   // 撤回按钮展示逻辑
   // todo: 人工节点 + 节点权限 + 后续节点是否有人工节点或者自动化任务
   var showWithdraw = isArtificialNode && open && isCurrentNodeHandler && canWithdraw && !readonly;
+  // const handleChangeTradeId = async (tid: string) => {
+  //   if (data?.data?.nodeInfo?.nodeType !== NodeType.START_NODE) {
+  //     console.debug('当前节点不需要查询标签')
+  //   }
+  //   if (tid) {
+  //     // TODO: 查询标签
+  //     const { data } = await queryLabelByTradeId({ tid })
+  //     dispatch(setLabelList(data?.map(item => item?.labelShowName) || []))
+  //   }
+  // };
   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) || []))),
     _calcWorkOrderList2 = _slicedToArray(_calcWorkOrderList, 1),
     transData = _calcWorkOrderList2[0];
@@ -276,6 +290,7 @@ var NodeItem = function NodeItem(props) {
     canModifyPayment: false,
     flowAllShowHideRules: allShowHideRules,
     firstOrderBackfill: false // TODO: 前面节点必然是已完成状态，已完成状态不再调用订单反填
+    // handleChangeTradeId={handleChangeTradeId}
   }) : /*#__PURE__*/React.createElement(RenderDetail, {
     workOrderTemplateInfo: data === null || data === void 0 ? void 0 : (_data$data19 = data.data) === null || _data$data19 === void 0 ? void 0 : _data$data19.workOrderTemplateInfo,
     transData: transData,

package/dist/esm/FlowTemplateDetail/index.js

@@ -21,7 +21,9 @@ import { useDispatch, useSelector, Provider, batch } from 'react-redux';
 import store from "../model/store";
 import zhCN from 'antd/es/locale/zh_CN';
 import { calcWorkOrderList, deleteCacheOrder } from "../common/utils/tools";
-import { setPlat, fetchPanelInfo, fetchAllFlowOperateRecord, setAction, setVisibleRemarkList, setAddRemarkVisible, setLoading, setClearStore } from "../model/flowTemplateDetail";
+import { setPlat, fetchPanelInfo, fetchAllFlowOperateRecord, setAction, setVisibleRemarkList, setAddRemarkVisible, setLoading, setClearStore
+// setLabelList
+} from "../model/flowTemplateDetail";
 import { selectFlowRecordList, selectRemarkRecordList, selectCurrentNodeDetail, selectTid, selectShopUniqueKey, selectOperateParams, selectFlowStatus, selectCurrentTradeIdWOrkOrderNumber, selectFlowTemplateId, selectLoading, selectWithDrawOrder, selectNodeAssistantMap, selectFlowTemplateType } from "../model/flowTemplateDetail/selector";
 import { NodeType, FlowStatus, FlowType } from "../model/flowTemplateDetail/types";
 import NodeItem from "./components/Item";
@@ -983,9 +985,10 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
   }, /*#__PURE__*/React.createElement("div", {
     className: "flowWorkOrderDetail"
   }, flowStatus && /*#__PURE__*/React.createElement(Row, {
-    justify: 'space-between'
-  }, /*#__PURE__*/React.createElement(Col, null, /*#__PURE__*/React.createElement("div", {
+    justify: 'space-between',
     className: "header"
+  }, /*#__PURE__*/React.createElement(Col, null, /*#__PURE__*/React.createElement("div", {
+    className: "statusWrap"
   }, "\u6D41\u7A0B\u72B6\u6001\uFF1A", /*#__PURE__*/React.createElement("div", {
     className: "status ".concat(flowStatus)
   }), /*#__PURE__*/React.createElement("span", null, FLOW_STATUS_V2[flowStatus]))), flowTemplateType !== 'SINGLE_PAGE' && /*#__PURE__*/React.createElement(Col, {

package/dist/esm/FlowTemplateDetail/index.less

@@ -6,16 +6,19 @@
     width: 200px
   }
   .header {
-    display: flex;
-    align-items: center;
     background: #FFF;
     height: 24px;
     width: 100%;
     margin-bottom: 8px;
     box-sizing: content-box;
-    z-index: 2;
-    > span {
-      margin-left: 8px;
+    z-index: 99;
+    padding: 8px;
+    .statusWrap {
+      display: flex;
+      align-items: center;
+      > span {
+        margin-left: 8px;
+      }
     }
     .status {
       width: 8px;

package/dist/esm/FormRender/index.js

@@ -330,7 +330,7 @@ var FormRender = function FormRender(props, ref) {
   //查询重复数量
   var queryReplaceCount = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(componentValue, templateDetail) {
-      var needCheckComponentList, params, _yield$replaceCheck, resultList, resultParams;
+      var needCheckComponentList, _templateDetail$flowT3, params, _yield$replaceCheck, resultList, resultParams;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -343,6 +343,7 @@ var FormRender = function FormRender(props, ref) {
               break;
             }
             params = {
+              flowTemplateKey: (_templateDetail$flowT3 = templateDetail.flowTemplateConfig) === null || _templateDetail$flowT3 === void 0 ? void 0 : _templateDetail$flowT3.flowTemplateKey,
               templateId: templateDetail.uniqueKey,
               workOrderUniqueKey: workOrderDetail === null || workOrderDetail === void 0 ? void 0 : workOrderDetail.uniqueKey,
               needCheckComponentList: needCheckComponentList

package/dist/esm/FormRenderTemplateId/index.js

@@ -323,7 +323,7 @@ var FormRender = function FormRender(props, ref) {
   //查询重复数量
   var queryReplaceCount = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(componentValue, templateDetail) {
-      var needCheckComponentList, params, _yield$replaceCheck, resultList, resultParams;
+      var needCheckComponentList, _templateDetail$flowT, params, _yield$replaceCheck, resultList, resultParams;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -336,6 +336,7 @@ var FormRender = function FormRender(props, ref) {
               break;
             }
             params = {
+              flowTemplateKey: (_templateDetail$flowT = templateDetail.flowTemplateConfig) === null || _templateDetail$flowT === void 0 ? void 0 : _templateDetail$flowT.flowTemplateKey,
               templateId: templateDetail.uniqueKey,
               workOrderUniqueKey: workOrderDetail === null || workOrderDetail === void 0 ? void 0 : workOrderDetail.uniqueKey,
               needCheckComponentList: needCheckComponentList

package/dist/esm/SingleShopWorkOrder/components/CustomizeFormModal/index.js

@@ -307,7 +307,7 @@ var CustomizeFormModal = function CustomizeFormModal(props) {
   //查询重复数量
   var queryReplaceCount = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(componentValue) {
-      var needCheckComponentList, params, _yield$replaceCheck, resultList, resultParams;
+      var needCheckComponentList, _templateDetail$flowT, params, _yield$replaceCheck, resultList, resultParams;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
@@ -320,6 +320,7 @@ var CustomizeFormModal = function CustomizeFormModal(props) {
               break;
             }
             params = {
+              flowTemplateKey: (_templateDetail$flowT = templateDetail.flowTemplateConfig) === null || _templateDetail$flowT === void 0 ? void 0 : _templateDetail$flowT.flowTemplateKey,
               templateId: templateDetail.uniqueKey,
               workOrderUniqueKey: workOrderDetail === null || workOrderDetail === void 0 ? void 0 : workOrderDetail.uniqueKey,
               needCheckComponentList: needCheckComponentList

package/dist/esm/common/utils/tools.js

@@ -926,6 +926,18 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
           name: item.name
         });
       }
+    } else if (item.workOrderComponentType === 'WDT_EXCHANGE_GOODS') {
+      var wdtExchange = get(nowData, "".concat(item.uniqueKey), {});
+      contentVoList.push({
+        uniqueKey: "".concat(item.uniqueKey, "_wdtExchangeGoods"),
+        content: wdtExchange === null || wdtExchange === void 0 ? void 0 : wdtExchange.wdtExchangeGoods,
+        name: item.name
+      });
+      contentVoList.push({
+        uniqueKey: "".concat(item.uniqueKey, "_shopCode"),
+        content: (wdtExchange === null || wdtExchange === void 0 ? void 0 : wdtExchange.shopCode) || '',
+        name: item.name
+      });
     } else if (['BS_REISSUE_GOODS', 'WDT_REISSUE_GOODS'].includes(item.workOrderComponentType)) {
       var reissueMap = {
         BS_REISSUE_GOODS: {
@@ -963,21 +975,34 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
           name: item.name
         });
       }
-    } else if (item.workOrderComponentType === 'BS_RETURN_GOODS') {
-      var bsReturn = get(nowData, "".concat(item.uniqueKey), {});
+    } else if (['BS_RETURN_GOODS', 'WDT_RETURN_GOODS'].includes(item.workOrderComponentType)) {
+      var currentReturn = get(nowData, "".concat(item.uniqueKey), {});
+      var compType = item.workOrderComponentType;
+      var returnGoodsMap = {
+        BS_RETURN_GOODS: {
+          returnTypeKey: 'bsReturnType',
+          returnGoodsKey: 'bsReturnGoods',
+          shopCodeKey: 'shopCode'
+        },
+        WDT_RETURN_GOODS: {
+          returnTypeKey: 'wdtReturnType',
+          returnGoodsKey: 'wdtReturnGoods',
+          shopCodeKey: 'shopCode'
+        }
+      };
       contentVoList.push({
-        uniqueKey: "".concat(item.uniqueKey, "_bsReturnType"),
-        content: bsReturn === null || bsReturn === void 0 ? void 0 : bsReturn.bsReturnType,
+        uniqueKey: "".concat(item.uniqueKey, "_").concat(returnGoodsMap[compType].returnTypeKey),
+        content: currentReturn === null || currentReturn === void 0 ? void 0 : currentReturn[returnGoodsMap[compType].returnTypeKey],
         name: item.name
       });
       contentVoList.push({
-        uniqueKey: "".concat(item.uniqueKey, "_bsReturnGoods"),
-        content: bsReturn === null || bsReturn === void 0 ? void 0 : bsReturn.bsReturnGoods,
+        uniqueKey: "".concat(item.uniqueKey, "_").concat(returnGoodsMap[compType].returnGoodsKey),
+        content: currentReturn === null || currentReturn === void 0 ? void 0 : currentReturn[returnGoodsMap[compType].returnGoodsKey],
         name: item.name
       });
       contentVoList.push({
-        uniqueKey: "".concat(item.uniqueKey, "_shopCode"),
-        content: (bsReturn === null || bsReturn === void 0 ? void 0 : bsReturn.shopCode) || '',
+        uniqueKey: "".concat(item.uniqueKey, "_").concat(returnGoodsMap[compType].shopCodeKey),
+        content: (currentReturn === null || currentReturn === void 0 ? void 0 : currentReturn[returnGoodsMap[compType].shopCodeKey]) || '',
         name: item.name
       });
     } else if (item.workOrderComponentType === 'BS_POSTING') {
@@ -1375,10 +1400,9 @@ var transDataSource = function transDataSource(templateColumns) {
           flag: item.jsonMap["".concat(nex.uniqueKey, "_bsFlag")]
         }));
       } else if (nex.workOrderComponentType === 'REISSUE_LOGISTICS') {
-        var _itemList6 = jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_reissueLogisticsList")], [{
-          logisticsCompany: null,
-          logisticsCode: null
-        }]);
+        var _itemList6 = jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_reissueLogisticsList")], [
+          // { logisticsCompany: null, logisticsCode: null },
+        ]);
         return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), _itemList6));
       } else if (['REISSUE_STATUS', 'ADJUST_WORK_ORDER_STATUS', 'CREATE_STATUS', 'INVOICE_STATUS', 'INVOICING_STATUS'].includes(nex.workOrderComponentType)) {
         var STATUS_MAP = {
@@ -1414,11 +1438,7 @@ var transDataSource = function transDataSource(templateColumns) {
           WAREHOUSING_STATUS: 'inStockStatusItemList',
           MSG_STATUS: 'msgStatusValues'
         };
-        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) ? [] : [{
-          status: undefined,
-          reason: '',
-          systemOrderId: ''
-        }])));
+        return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_").concat(STATUS_LIST_MAP[nex.workOrderComponentType])], [])));
       } else if (['BS_LOGISTICS', 'WLN_LOGISTICS', 'WDT_LOGISTICS'].includes(nex.workOrderComponentType)) {
         var LogisticsMap = {
           BS_LOGISTICS: {
@@ -1534,12 +1554,27 @@ var transDataSource = function transDataSource(templateColumns) {
           bsExchangeGiftGoods: jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_bsExchangeGiftGoods")], []),
           shopCode: item.jsonMap["".concat(nex.uniqueKey, "_shopCode")]
         }));
-      } else if (nex.workOrderComponentType === 'BS_RETURN_GOODS') {
+      } else if (nex.workOrderComponentType === 'WDT_EXCHANGE_GOODS') {
         return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), {
-          bsReturnType: jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_bsReturnType")], []),
-          bsReturnGoods: jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_bsReturnGoods")], []),
+          wdtExchangeGoods: jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_wdtExchangeGoods")], []),
           shopCode: item.jsonMap["".concat(nex.uniqueKey, "_shopCode")]
         }));
+      } else if (['BS_RETURN_GOODS', 'WDT_RETURN_GOODS'].includes(nex.workOrderComponentType)) {
+        var _$concat2;
+        var compType = nex.workOrderComponentType;
+        var returnGoodsMap = {
+          BS_RETURN_GOODS: {
+            returnTypeKey: 'bsReturnType',
+            returnGoodsKey: 'bsReturnGoods',
+            shopCodeKey: 'shopCode'
+          },
+          WDT_RETURN_GOODS: {
+            returnTypeKey: 'wdtReturnType',
+            returnGoodsKey: 'wdtReturnGoods',
+            shopCodeKey: 'shopCode'
+          }
+        };
+        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)));
       } else if (['BS_SYSTEM_ORDER', 'WLN_SYSTEM_ORDER', 'WDT_SYSTEM_ORDER'].includes(nex.workOrderComponentType)) {
         var systemOrderMap = {
           BS_SYSTEM_ORDER: {
@@ -1577,24 +1612,17 @@ var transDataSource = function transDataSource(templateColumns) {
           },
           RETURN_GOODS_TRADE_ID: {
             key: 'returnGoodsTradeItemList',
-            defaultValue: [{
-              returnGoodsTradeId: '',
-              systemOrderId: ''
-            }]
+            defaultValue: []
+            // defaultValue: [{ returnGoodsTradeId: '', systemOrderId: '' }],
           },
+
           REISSUE_TRADE_ID: {
             key: 'tradeItemList',
-            defaultValue: [{
-              billNo: '',
-              tradeId: ''
-            }]
+            defaultValue: []
           },
           EXCHANGE_TRADE_ID: {
             key: 'tradeItemList',
-            defaultValue: [{
-              billNo: '',
-              tradeId: ''
-            }]
+            defaultValue: []
           }
         };
         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)));
@@ -1610,6 +1638,9 @@ var transDataSource = function transDataSource(templateColumns) {
           shopCode: item.jsonMap["".concat(nex.uniqueKey, "_shopCode")],
           wdtSystemOrderNo: item.jsonMap["".concat(nex.uniqueKey, "_wdtSystemOrderNo")]
         }));
+      } else if (nex.workOrderComponentType === 'LABEL') {
+        var _objectSpread55;
+        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));
       }
     }, {});
   };
@@ -1631,7 +1662,7 @@ export var calcWorkOrderList = function calcWorkOrderList(source, templateColumn
 //订单返填
 export var orderBack = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
-    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;
+    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;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -1745,8 +1776,10 @@ export var orderBack = /*#__PURE__*/function () {
             });
           }
           bsInfo = bsOrderTransform(bsOrders || {});
-          wlnInfo = wlnOrderTransform(wlnOrders || {});
-          wdtInfo = wdtOrderTransform(wdtOrders || {});
+          wlnInfo = wlnOrderTransform(wlnOrders || {}); // const wdtInfo = wdtOrderTransform(wdtOrders || {});
+          wdtInfo = wdtOrderTransform(_objectSpread(_objectSpread({}, wdtOrders), {}, {
+            componentList: templateDetail.componentDtoList
+          }), form);
           if ((bsOrders === null || bsOrders === void 0 ? void 0 : (_bsOrders$orders = bsOrders.orders) === null || _bsOrders$orders === void 0 ? void 0 : _bsOrders$orders.length) > 1) {
             bsInfo.bsGoods = _objectSpread(_objectSpread({}, bsInfo.bsGoods), {}, {
               bsGoods: []
@@ -1870,7 +1903,7 @@ export var orderBack = /*#__PURE__*/function () {
               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))))));
             } else {
               _cacheOrderInfo = JSON.parse(sessionStorage.getItem('cacheOrderInfo') || '{}');
-              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))));
+              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))));
             }
           }
           // console.log('orderback', values);
@@ -2191,6 +2224,8 @@ export var reversalFormValues = function reversalFormValues() {
       case 'BS_EXCHANGE_GOODS':
       case 'BS_RETURN_GOODS':
       case 'WDT_REISSUE_GOODS':
+      case 'WDT_RETURN_GOODS':
+      case 'WDT_EXCHANGE_GOODS':
         prv["".concat(next.uniqueKey, "_shopCode")] = values[next.uniqueKey]['shopCode'];
         break;
       case 'BS_DELIVERY_NO':

package/dist/esm/model/flowTemplateDetail/index.d.ts

@@ -10,6 +10,6 @@ export declare const setFlowList: import("@reduxjs/toolkit").ActionCreatorWithPa
     lastWorkOrderDetail: any;
 }, "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<{
     nodeId: string;
-}, "flowTemplateDetail/setWithdrawWorkOrderDetail">, setFlowTemplateType: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, "flowTemplateDetail/setFlowTemplateType">;
+}, "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">;
 declare const _default: import("redux").Reducer<FlowTemplateDetailState, import("redux").AnyAction>;
 export default _default;

package/dist/esm/model/flowTemplateDetail/index.js

@@ -40,7 +40,8 @@ export var initialState = {
   },
   tid: '',
   shopUniqueKey: '',
-  flowTemplateType: ''
+  flowTemplateType: '',
+  labelList: []
 };
 export var fetchPanelInfo = function fetchPanelInfo(params, options) {
   return /*#__PURE__*/function () {
@@ -314,6 +315,13 @@ var slice = createSlice({
     setFlowTemplateType: function setFlowTemplateType(state, _ref22) {
       var payload = _ref22.payload;
       state.flowTemplateType = payload;
+    },
+    setLabelList: function setLabelList(state, _ref23) {
+      var payload = _ref23.payload;
+      state.labelList = payload;
+    },
+    clearLabelList: function clearLabelList(state) {
+      state.labelList = [];
     }
   }
 });
@@ -336,6 +344,8 @@ var _slice$actions = slice.actions,
   setCurrentFlowAllShowHideRules = _slice$actions.setCurrentFlowAllShowHideRules,
   setClearStore = _slice$actions.setClearStore,
   setWithdrawWorkOrderDetail = _slice$actions.setWithdrawWorkOrderDetail,
-  setFlowTemplateType = _slice$actions.setFlowTemplateType;
-export { setFlowList, setNodeAssistantInfo, setTid, setShopUniqueKey, setRemarkList, setCurrentNode, setAction, setVisibleRemarkList, setPlat, setOperateParams, setAddRemarkVisible, setFlowStatus, setCurrentTradeIdWOrkOrderNumber, setFlowTemplateId, setLoading, setCurrentFlowAllShowHideRules, setClearStore, setWithdrawWorkOrderDetail, setFlowTemplateType };
+  setFlowTemplateType = _slice$actions.setFlowTemplateType,
+  setLabelList = _slice$actions.setLabelList,
+  clearLabelList = _slice$actions.clearLabelList;
+export { setFlowList, setNodeAssistantInfo, setTid, setShopUniqueKey, setRemarkList, setCurrentNode, setAction, setVisibleRemarkList, setPlat, setOperateParams, setAddRemarkVisible, setFlowStatus, setCurrentTradeIdWOrkOrderNumber, setFlowTemplateId, setLoading, setCurrentFlowAllShowHideRules, setClearStore, setWithdrawWorkOrderDetail, setFlowTemplateType, setLabelList, clearLabelList };
 export default slice.reducer;

package/dist/esm/model/flowTemplateDetail/selector.d.ts

@@ -698,3 +698,17 @@ export declare const selectFlowTemplateType: ((state: {
 }> & {
     clearCache: () => void;
 };
+export declare const selectLabelList: ((state: {
+    login: import("../login").GlobalState;
+    global: import("../global").GlobalState;
+    workOrder: import("../workOrder").WorkOrderState;
+    customizeWorkOrder: import("../customizeWorkOrder/types").CustomizeWorkOrderState;
+    paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
+    singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
+    logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("./types").FlowTemplateDetailState;
+}) => string[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").FlowTemplateDetailState) => string[], {
+    clearCache: () => void;
+}> & {
+    clearCache: () => void;
+};

package/dist/esm/model/flowTemplateDetail/selector.js

@@ -57,4 +57,7 @@ export var selectWithDrawOrder = createSelector([selectSlice], function (state)
 });
 export var selectFlowTemplateType = createSelector([selectSlice], function (state) {
   return state.flowTemplateType;
+});
+export var selectLabelList = createSelector([selectSlice], function (state) {
+  return state.labelList;
 });

package/dist/esm/model/flowTemplateDetail/types.d.ts

@@ -61,6 +61,7 @@ export interface FlowTemplateDetailState {
     tid: string;
     shopUniqueKey: string;
     flowTemplateType: FlowType;
+    labelList: Array<string>;
 }
 export interface QyFlowPanelInfoRequest {
     /**

package/dist/esm/model/logicFlow/index.js

@@ -89,22 +89,21 @@ export var fetchLogicFlowList = /*#__PURE__*/function () {
               });
             }
             return prv;
-          }, []);
-          console.log(list);
+          }, []); // console.log(list);
           dispatch(setLogicFlowList(list || []));
           dispatch(setGroupLogicFlowList(groupLogicFlowList || []));
           dispatch(setFlowTemplateGroupWorkOrderTemplateList(flowTemplateGroupWOrkOrderTemplateList) || []);
-          _context.next = 18;
+          _context.next = 17;
           break;
-        case 15:
-          _context.prev = 15;
+        case 14:
+          _context.prev = 14;
           _context.t0 = _context["catch"](0);
           console.error(_context.t0);
-        case 18:
+        case 17:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[0, 15]]);
+    }, _callee, null, [[0, 14]]);
   }));
   return function fetchLogicFlowList(_x) {
     return _ref.apply(this, arguments);

package/dist/esm/model/servers/api.d.ts

@@ -76,4 +76,7 @@ export declare const updatePlatformMemo: (data: {
 export declare const queryNodesByFlowTemplateKey: (data: string) => Promise<any>;
 export declare const wlnOrderDetail: (data: any) => Promise<any>;
 export declare const getSellerRemark: (data?: any) => Promise<any>;
+export declare const queryLabelByTradeId: (data: any) => Promise<serverProps<Array<{
+    labelShowName: string;
+}>>>;
 export declare const createWdtReissueOrder: <REQ = any, RES = any>(data: REQ) => Promise<serverProps<RES>>;

package/dist/esm/model/servers/api.js

@@ -488,6 +488,14 @@ export var getSellerRemark = function getSellerRemark(data) {
   });
 };
 
+// 查询订单所需标签
+export var queryLabelByTradeId = function queryLabelByTradeId(data) {
+  return request({
+    url: '/qy/gdfw/risk/warning/queryUserLabel',
+    method: 'post',
+    data: data
+  });
+};
 // wdt 创建补发单
 export var createWdtReissueOrder = function createWdtReissueOrder(data) {
   return request({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
-  "version": "1.2.0",
+  "version": "1.3.0-rc.0",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -32,9 +32,9 @@
   },
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
-    "@kmkf-fe-packages/basic-components": "1.2.0",
-    "@kmkf-fe-packages/kmkf-utils": "1.2.0",
-    "@kmkf-fe-packages/services-components": "1.2.0",
+    "@kmkf-fe-packages/basic-components": "1.3.0-rc.0",
+    "@kmkf-fe-packages/kmkf-utils": "1.3.0-rc.0",
+    "@kmkf-fe-packages/services-components": "1.3.0-rc.0",
     "@reduxjs/toolkit": "^1.8.5",
     "ahooks": "^3.7.4",
     "copy-to-clipboard": "^3.3.3",
@@ -73,7 +73,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b14fc34f8d5d1d37484367f2a09782c4f9d065cb",
+  "gitHead": "9c12f39cee1a086e3c49778be6c26e64bdc0833b",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }