@kmkf-fe-packages/kmkf-work-order-service-component 1.4.2 → 1.4.3-rc.1

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

@@ -24,7 +24,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useState, useRef, useEffect, useMemo, forwardRef, useImperativeHandle } from 'react';
 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 { get, some, set, every, cloneDeep, isEmpty, intersection, throttle, groupBy } from 'lodash';
 import 'moment/locale/zh-cn';
 import { calcWorkOrderList, orderBack, getReplaceWarnValues, COMPONENT_MAP_NAME, EXCLUDE_REPLACE_TOP_COMPONENT,
 // 重复检验不需要展示在顶部的
@@ -50,6 +50,7 @@ var hasComponent = function hasComponent(componentDtoList, workOrderComponentTyp
 // TODO: 用useState会有bug, 不确定是哪里导致的
 var hideByXYComponentsMap = {};
 var FormRender = function FormRender(props, ref) {
+  var _Object$keys2;
   useImperativeHandle(ref, function () {
     return {
       batchFillByMapping: batchFillByMapping
@@ -366,11 +367,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$jsonMap2 = record.jsonMap) !== null && _record$jsonMap2 !== void 0 && _record$jsonMap2["".concat(_tradeIdUniqueKey, "_tradeId")] && firstOrderBackfill) {
+      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$jsonMap3 = record.jsonMap) === null || _record$jsonMap3 === void 0 ? void 0 : _record$jsonMap3["".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,
@@ -542,20 +543,6 @@ 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) {
@@ -575,18 +562,26 @@ var FormRender = function FormRender(props, ref) {
             }
             return _context2.abrupt("return", console.debug('查询标签缺少必要参数-shopId'));
           case 4:
-            _context2.next = 6;
+            if (tid) {
+              _context2.next = 8;
+              break;
+            }
+            setLabelList([]);
+            form.setFieldsValue(_defineProperty({}, "".concat(labelComponent.uniqueKey), []));
+            return _context2.abrupt("return", console.debug('查询标签缺少必要参数-tradeId'));
+          case 8:
+            _context2.next = 10;
             return queryLabelByTradeId({
               tid: tid,
               shopId: shopId
             });
-          case 6:
+          case 10:
             _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 15:
           case "end":
             return _context2.stop();
         }
@@ -601,7 +596,6 @@ var FormRender = function FormRender(props, ref) {
   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,
@@ -658,25 +652,28 @@ var FormRender = function FormRender(props, ref) {
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
+            if (type === 'tradeId') {
+              queryLabels(value, form.getFieldValue('shopId'));
+            }
             // 针对订单号组件进行当前订单查重校验
             if ((type === 'tradeId' || type === 'enterprisePaymentTid') && typeof handleChangeTradeId === 'function') {
               handleChangeTradeId(value);
             }
             if (value) {
-              _context3.next = 4;
+              _context3.next = 5;
               break;
             }
             setReplaceValue(function (prev) {
               return _objectSpread(_objectSpread({}, prev), {}, _defineProperty({}, type, 0));
             });
             return _context3.abrupt("return");
-          case 4:
+          case 5:
             queryReplaceCount(_defineProperty({}, type, value), templateDetail);
             // TODO: ERP不走订单反弹逻辑
             if ((type === 'tradeId' || type === 'enterprisePaymentTid') && !isErpUse) {
               changeHandle(value);
             }
-          case 6:
+          case 7:
           case "end":
             return _context3.stop();
         }
@@ -691,7 +688,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', 'KM_SEND_GOOD'].includes(nxt === null || nxt === void 0 ? void 0 : nxt.workOrderComponentType)) {
         cur.push(nxt === null || nxt === void 0 ? void 0 : nxt.uniqueKey);
       }
       return cur;
@@ -729,7 +726,7 @@ var FormRender = function FormRender(props, ref) {
     }
     //如果有bs组件 设置成初始值
     var hasBs = get(templateDetail, 'componentDtoList', []).some(function (item) {
-      return ['BS_LOGISTICS', 'BS_SEND_GOOD', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WLN_LOGISTICS', 'WLN_SEND_GOOD'].includes(item.workOrderComponentType);
+      return ['BS_LOGISTICS', 'BS_SEND_GOOD', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WLN_LOGISTICS', 'WLN_SEND_GOOD', 'KM_SEND_GOOD'].includes(item.workOrderComponentType);
     });
     if (hasBs) {
       var bsValue = get(templateDetail, 'componentDtoList', []).reduce(function (prv, next) {
@@ -745,6 +742,7 @@ var FormRender = function FormRender(props, ref) {
           case 'BS_SEND_GOOD':
           case 'WLN_SEND_GOOD':
           case 'WDT_SEND_GOOD':
+          case 'KM_SEND_GOOD':
             prv[next.uniqueKey] = [{
               sendName: '',
               sendId: ''
@@ -759,13 +757,17 @@ var FormRender = function FormRender(props, ref) {
     var allValue = form.getFieldsValue();
     var tradeIdUniqueKey = hasComponent(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, 'TRADE_ID_INPUT');
     var paymentUniqueKey = hasComponent(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, 'ENTERPRISE_PAYMENT');
+    if (tradeIdUniqueKey) {
+      var tradeValue = allValue[tradeIdUniqueKey];
+      queryLabels(tradeValue, val);
+    }
     if (tradeIdUniqueKey || paymentUniqueKey) {
       var _allValue;
-      var tradeValue = allValue[tradeIdUniqueKey];
+      var _tradeValue = allValue[tradeIdUniqueKey];
       var paymentValue = (_allValue = allValue[paymentUniqueKey]) === null || _allValue === void 0 ? void 0 : _allValue.enterprisePaymentTid;
-      if (tradeValue || paymentValue) {
+      if (_tradeValue || paymentValue) {
         orderBack({
-          order_no: tradeValue || paymentValue,
+          order_no: _tradeValue || paymentValue,
           form: form,
           shopId: val,
           shopList: shopList,
@@ -793,7 +795,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;
@@ -816,7 +818,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)) {
@@ -834,7 +837,7 @@ var FormRender = function FormRender(props, ref) {
   };
   var newRenderColumnItem = function newRenderColumnItem(effects) {
     return function (item) {
-      var _componentConfig$stat, _componentConfig$stat2, _templateDetail$flowT2;
+      var _templateDetail$flowT2;
       var _item$componentConfig2 = item.componentConfig,
         componentConfig = _item$componentConfig2 === void 0 ? {} : _item$componentConfig2,
         workOrderComponentType = item.workOrderComponentType,
@@ -848,7 +851,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: 非前置节点组件渲染消费是否可以编辑配置
@@ -902,8 +917,8 @@ var FormRender = function FormRender(props, ref) {
           shouldUpdate: function shouldUpdate() {
             return true; // TODO: 修复重复依赖的问题 https://tb.raycloud.com/task/64e4491e0b8b5c001e1099b9
           }
-        }, function (_ref5) {
-          var getFieldValue = _ref5.getFieldValue;
+        }, function (_ref6) {
+          var getFieldValue = _ref6.getFieldValue;
           var show = currentIdDependenceOtherFields === null || currentIdDependenceOtherFields === void 0 ? void 0 : currentIdDependenceOtherFields.reduce(function (cur, nxt) {
             // 如果有一项满足展示条件则展示
             if (cur) {
@@ -1020,10 +1035,10 @@ var FormRender = function FormRender(props, ref) {
     //如果是初始化创建工单 缓存信息
     if (!workOrderId && ['fxg', 'tb', 'ks', 'xiaozhi'].includes(plat.platform)) {
       var _tempLateList$find;
-      var _tradeIdUniqueKey2 = (_tempLateList$find = tempLateList.find(function (item) {
+      var tradeIdUniqueKey = (_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[_tradeIdUniqueKey2];
+      var tradeId = value[tradeIdUniqueKey];
       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)))));
@@ -1099,10 +1114,12 @@ var FormRender = function FormRender(props, ref) {
     style: {
       marginBottom: '8px'
     }
-  }, labelList === null || labelList === void 0 ? void 0 : labelList.map(function (l) {
+  }, (_Object$keys2 = Object.keys(groupBy(labelList, function (item) {
+    return item.labelShowName;
+  }))) === null || _Object$keys2 === void 0 ? void 0 : _Object$keys2.map(function (labelShowName) {
     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);
+      return item.value === labelShowName;
     })) || {};
     if (!isNull(label)) return /*#__PURE__*/React.createElement(Tag, {
       color: label === null || label === void 0 ? void 0 : label.color

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

@@ -21,7 +21,7 @@ import { get, every, maxBy } from 'lodash';
 import V from 'voca';
 import { orderDetail, jstOrderDetail, bsOrderDetail, wlnOrderDetail, wdtOrderDetail } from "../../model/servers/api";
 import moment from 'moment';
-import { AddressData, ExpressData, ExpressInterceptData, orderBackFormValues, bsOrderBackFormValues, wlnOrderBackFormValues, wdtOrderBackFormValues, findLabelBySelectValue, request, isNull, bsOrderTransform, wlnOrderTransform, wdtOrderTransform, unTransField } from '@kmkf-fe-packages/kmkf-utils';
+import { AddressData, ExpressData, ExpressInterceptData, orderBackFormValues, bsOrderBackFormValues, wlnOrderBackFormValues, wdtOrderBackFormValues, findLabelBySelectValue, request, isNull, bsOrderTransform, wlnOrderTransform, wdtOrderTransform, filterWdtOrders, unTransField } from '@kmkf-fe-packages/kmkf-utils';
 import { cloneDeep, isEqual, set } from 'lodash';
 import Monitor from 'kmkf-monitor';
 import { PlatForm } from "../../model/flowTemplateDetail/types";
@@ -775,7 +775,7 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
         }),
         name: item.name
       });
-    } else if (['BS_SEND_GOOD', 'WLN_SEND_GOOD', 'WDT_SEND_GOOD'].includes(item.workOrderComponentType)) {
+    } else if (['BS_SEND_GOOD', 'WLN_SEND_GOOD', 'WDT_SEND_GOOD', 'KM_SEND_GOOD'].includes(item.workOrderComponentType)) {
       var sendGoodMap = {
         BS_SEND_GOOD: {
           list: 'bsSendGood',
@@ -791,6 +791,11 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
           list: 'wdtSendGood',
           id: 'wdtSendId',
           name: 'wdtSendName'
+        },
+        KM_SEND_GOOD: {
+          list: 'kmSendGood',
+          id: 'kmSendId',
+          name: 'kmSendName'
         }
       };
       var bsSendList = get(nowData, "".concat(item.uniqueKey), []);
@@ -817,6 +822,17 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
         }),
         name: item.name
       });
+      if (item.workOrderComponentType === 'WDT_SEND_GOOD') {
+        contentVoList.push({
+          uniqueKey: "".concat(item.uniqueKey, "_sendSnapshotName"),
+          content: bsSendList.filter(function (t) {
+            return t.sendSnapshotName;
+          }).map(function (item) {
+            return item.sendSnapshotName + '';
+          }),
+          name: item.name
+        });
+      }
     } else if (item.workOrderComponentType === 'LOGISTICS_TRAJECTORY') {
       var logisticsTrajectoryMap = ['trajectoryCompany', 'trajectoryCode', 'trajectorySnapshot', 'trajectoryPhone'];
       logisticsTrajectoryMap.map(function (s) {
@@ -926,6 +942,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 +991,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 +1416,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 +1454,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: {
@@ -1439,7 +1475,7 @@ var transDataSource = function transDataSource(templateColumns) {
           logisticsCompany: null,
           logisticsCode: null
         }]));
-      } else if (['BS_SEND_GOOD', 'WLN_SEND_GOOD', 'WDT_SEND_GOOD'].includes(nex.workOrderComponentType)) {
+      } else if (['BS_SEND_GOOD', 'WLN_SEND_GOOD', 'WDT_SEND_GOOD', 'KM_SEND_GOOD'].includes(nex.workOrderComponentType)) {
         var sendGoodMap = {
           BS_SEND_GOOD: {
             list: 'bsSendGood'
@@ -1449,6 +1485,9 @@ var transDataSource = function transDataSource(templateColumns) {
           },
           WDT_SEND_GOOD: {
             list: 'wdtSendGood'
+          },
+          KM_SEND_GOOD: {
+            list: 'kmSendGood'
           }
         };
         var _itemList8 = jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_").concat(sendGoodMap[nex.workOrderComponentType].list)], [{
@@ -1534,12 +1573,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 +1631,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)));
@@ -1611,8 +1658,10 @@ var transDataSource = function transDataSource(templateColumns) {
           wdtSystemOrderNo: item.jsonMap["".concat(nex.uniqueKey, "_wdtSystemOrderNo")]
         }));
       } else if (nex.workOrderComponentType === 'LABEL') {
-        var _objectSpread54;
-        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));
+        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));
+      } else if (nex.workOrderComponentType === 'AFTER_SALES_ORDER_ID') {
+        return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_afterSalesOrderId")]));
       }
     }, {});
   };
@@ -1634,7 +1683,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, _objectSpread56, _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, _objectSpread58, _cacheOrderInfo;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -1739,6 +1788,7 @@ export var orderBack = /*#__PURE__*/function () {
           bsOrders = (bsOrder === null || bsOrder === void 0 ? void 0 : (_bsOrder$value = bsOrder.value) === null || _bsOrder$value === void 0 ? void 0 : _bsOrder$value.data) || {};
           wlnOrders = (wlnOrder === null || wlnOrder === void 0 ? void 0 : (_wlnOrder$value = wlnOrder.value) === null || _wlnOrder$value === void 0 ? void 0 : _wlnOrder$value.data) || {};
           wdtOrders = (wdtOrder === null || wdtOrder === void 0 ? void 0 : (_wdtOrder$value = wdtOrder.value) === null || _wdtOrder$value === void 0 ? void 0 : _wdtOrder$value.data) || {};
+          wdtOrders.trades = filterWdtOrders(wdtOrders, order_no);
           Monitor.automaticReport({
             message: "orderBack:\u8BA2\u5355\u53F7:".concat(order_no, ",\u5E97\u94FAid:").concat(shopId, ", \u8BA2\u5355\u4FE1\u606F\uFF1A").concat(JSON.stringify(orderInfo), ",jst\u4FE1\u606F:").concat(JSON.stringify(jstInfo), ",bs\u4FE1\u606F:").concat(JSON.stringify(bsOrders), ",wln\u4FE1\u606F:").concat(JSON.stringify(wlnOrders), ",wdt\u4FE1\u606F:").concat(JSON.stringify(wdtOrders))
           });
@@ -1748,8 +1798,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, order_no);
           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: []
@@ -1811,7 +1863,7 @@ export var orderBack = /*#__PURE__*/function () {
           hasSelectItem = HasErpItemSelectHandle(templateDetail);
           erpPromiseList = [];
           if (!(shopSourceStr === 'TAOBAO' && hasSelectItem)) {
-            _context.next = 56;
+            _context.next = 57;
             break;
           }
           list = detail['itemList'];
@@ -1829,10 +1881,10 @@ export var orderBack = /*#__PURE__*/function () {
               resolve({});
             });
           });
-          _context.prev = 46;
-          _context.next = 49;
+          _context.prev = 47;
+          _context.next = 50;
           return Promise.all(promises);
-        case 49:
+        case 50:
           erpPromiseList = _context.sent;
           detail['itemList'] = (_detail$itemList = detail['itemList']) === null || _detail$itemList === void 0 ? void 0 : _detail$itemList.map(function (item, index) {
             return _objectSpread(_objectSpread({}, item), {}, {
@@ -1842,13 +1894,13 @@ export var orderBack = /*#__PURE__*/function () {
               })
             });
           });
-          _context.next = 56;
+          _context.next = 57;
           break;
-        case 53:
-          _context.prev = 53;
-          _context.t0 = _context["catch"](46);
+        case 54:
+          _context.prev = 54;
+          _context.t0 = _context["catch"](47);
           console.error('调用erp获取宝贝编码错误', _context.t0);
-        case 56:
+        case 57:
           // console.log('detail', detail);
           values = orderBackFormValues({
             detail: detail,
@@ -1873,23 +1925,23 @@ 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), {}, (_objectSpread56 = {}, _defineProperty(_objectSpread56, order_no, values), _defineProperty(_objectSpread56, "".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId), _defineProperty({}, order_no, _objectSpread(_objectSpread({}, formValue), values))), _objectSpread56))));
+              sessionStorage.setItem('cacheOrderInfo', JSON.stringify(_objectSpread(_objectSpread({}, _cacheOrderInfo), {}, (_objectSpread58 = {}, _defineProperty(_objectSpread58, order_no, values), _defineProperty(_objectSpread58, "".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId), _defineProperty({}, order_no, _objectSpread(_objectSpread({}, formValue), values))), _objectSpread58))));
             }
           }
           // console.log('orderback', values);
           form.setFieldsValue(_objectSpread(_objectSpread({}, formValue), values));
           callback === null || callback === void 0 ? void 0 : callback(detail, templateDetail);
-          _context.next = 65;
+          _context.next = 66;
           break;
-        case 62:
-          _context.prev = 62;
+        case 63:
+          _context.prev = 63;
           _context.t1 = _context["catch"](8);
           console.error(_context.t1);
-        case 65:
+        case 66:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[8, 62], [46, 53]]);
+    }, _callee, null, [[8, 63], [47, 54]]);
   }));
   return function orderBack(_x) {
     return _ref2.apply(this, arguments);
@@ -2194,6 +2246,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/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/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
-  "version": "1.4.2",
+  "version": "1.4.3-rc.1",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
     "dist"
   ],
   "scripts": {
-    "async": "yarn build && yalc push",
+    "sync": "yarn build && yalc push",
     "build": "yarn run lint && father build",
     "deploy": "npm run docs:build && npm run docs:deploy",
     "docs:build": "dumi build",
@@ -32,9 +32,9 @@
   },
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
-    "@kmkf-fe-packages/basic-components": "1.4.2",
-    "@kmkf-fe-packages/kmkf-utils": "1.4.2",
-    "@kmkf-fe-packages/services-components": "1.4.2",
+    "@kmkf-fe-packages/basic-components": "1.4.3-rc.1",
+    "@kmkf-fe-packages/kmkf-utils": "1.4.3-rc.1",
+    "@kmkf-fe-packages/services-components": "1.4.3-rc.1",
     "@reduxjs/toolkit": "^1.8.5",
     "ahooks": "^3.7.4",
     "copy-to-clipboard": "^3.3.3",
@@ -73,7 +73,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0a85a17cc8fd63cb7f30daf63beebd034f58da6e",
+  "gitHead": "31edda885c2692da8299ca9830eb52336e868572",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }