@kmkf-fe-packages/kmkf-work-order-service-component 1.3.0 → 1.4.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/common.d.ts

@@ -13,6 +13,7 @@ export declare const FLOW_STATUS_V2: {
     COMPLETED: string;
     CLOSED: string;
 };
+export declare const CANNOT_BACK_FILL: string[];
 export declare const verifyHandle: (data: any, componentDtoList: Array<any>) => {
     success: boolean;
     message: string;

package/dist/esm/FlowTemplateDetail/common.js

@@ -51,6 +51,8 @@ export var FLOW_STATUS_V2 = {
   COMPLETED: '已完成',
   CLOSED: '已关闭'
 };
+//不能回填的组件type
+export var CANNOT_BACK_FILL = ['LOGISTICS_TRAJECTORY', 'LOGISTICS_TRAJECTORY_MORE', 'BUYER_MESSAGE_NOTICE', 'MSG_STATUS', 'NEW_PAYMENT_STATUS', 'REISSUE_STATUS', 'REISSUE_LOGISTICS', 'RETURN_GOODS_STATUS', 'RETURN_GOODS_TRADE_ID', 'ADJUST_WORK_ORDER_STATUS', 'INVOICE_STATUS', 'INVOICING_STATUS', 'EXCHANGE_STATUS', 'WAREHOUSING_STATUS', 'EXCHANGE_TRADE_ID', 'LOGISTICS_INTERCEPTION', 'LOGISTICS_INTERCEPTION_MORE'];
 export var verifyHandle = function verifyHandle(data, componentDtoList) {
   var _componentDtoList$fin, _componentDtoList$fin2, _data$paymentUniqueKe, _data$paymentUniqueKe2;
   var res = {

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

@@ -33,7 +33,7 @@ import styles from "./index.module.less";
 import { PlatForm } from "../../../WorkOrder/types";
 import { useSignal } from "../../../hooks/useSignal";
 var CurrentNode = function CurrentNode(props, ref) {
-  var _currentNodeDetail$no, _currentNodeDetail$no2, _currentNodeDetail$no3, _currentNodeDetail$no4, _currentNodeDetail$no16, _currentNodeDetail$wo10, _currentNodeDetail$wo11, _currentNodeDetail$wo12, _currentNodeDetail$wo13, _currentNodeDetail$wo14, _currentNodeDetail$wo15, _currentNodeDetail$wo16, _currentNodeDetail$wo17, _currentNodeDetail$no18, _currentNodeDetail$no19, _currentNodeDetail$wo18;
+  var _currentNodeDetail$no, _currentNodeDetail$no2, _currentNodeDetail$no3, _currentNodeDetail$no4, _currentNodeDetail$no16, _currentNodeDetail$wo10, _currentNodeDetail$wo11, _currentNodeDetail$wo12, _currentNodeDetail$wo13, _currentNodeDetail$wo14, _currentNodeDetail$wo15, _currentNodeDetail$wo16, _currentNodeDetail$wo17, _currentNodeDetail$wo18, _currentNodeDetail$wo19, _currentNodeDetail$no18, _currentNodeDetail$no19, _currentNodeDetail$wo20;
   var formRenderRef = useRef(null);
   useImperativeHandle(ref, function () {
     return {
@@ -108,7 +108,7 @@ var CurrentNode = function CurrentNode(props, ref) {
       // 当订单号清空时，需要将外层的订单已录入数量情况
       dispatch(setCurrentTradeIdWOrkOrderNumber({
         total: 0,
-        lastWorkOrderDetail: undefined
+        workOrderList: []
       }));
     } else {
       var _currentNodeDetail$no14;
@@ -118,7 +118,7 @@ var CurrentNode = function CurrentNode(props, ref) {
         flowTemplateKey: operateParams === null || operateParams === void 0 ? void 0 : operateParams.flowTemplateKey,
         desensitizedFlag: false,
         pageNo: 1,
-        pageSize: 1,
+        pageSize: 100,
         queryComponents: [{
           key: "".concat(tradeKey),
           symbol: 'in',
@@ -220,15 +220,16 @@ var CurrentNode = function CurrentNode(props, ref) {
     nodeName: nodeName,
     showEdit: showEdit,
     showLook: false,
-    handler: isArtificialNode ? currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo11 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo11 === void 0 ? void 0 : (_currentNodeDetail$wo12 = _currentNodeDetail$wo11.handlerList) === null || _currentNodeDetail$wo12 === void 0 ? void 0 : (_currentNodeDetail$wo13 = _currentNodeDetail$wo12[0]) === null || _currentNodeDetail$wo13 === void 0 ? void 0 : _currentNodeDetail$wo13.account : '',
-    showWithdraw: isArtificialNode && (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo14 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo14 === void 0 ? void 0 : _currentNodeDetail$wo14.flowStatus) === FlowStatus.COMPLETED && isCurrentNodeHandler && !readonly,
-    showReminder: isArtificialNode && [NodeStatus.WAITING, NodeStatus.STOPPING].includes(currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo15 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo15 === void 0 ? void 0 : _currentNodeDetail$wo15.flowStatus) && isCurrentNodeHandler && !readonly,
-    isReminder: JSON.parse((currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo16 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo16 === void 0 ? void 0 : (_currentNodeDetail$wo17 = _currentNodeDetail$wo16.jsonMap) === null || _currentNodeDetail$wo17 === void 0 ? void 0 : _currentNodeDetail$wo17.flowTags) || '[]').includes('REMINDER'),
+    handler: isArtificialNode ? (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo11 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo11 === void 0 ? void 0 : _currentNodeDetail$wo11.completedUserName) || (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo12 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo12 === void 0 ? void 0 : (_currentNodeDetail$wo13 = _currentNodeDetail$wo12.handlerList) === null || _currentNodeDetail$wo13 === void 0 ? void 0 : (_currentNodeDetail$wo14 = _currentNodeDetail$wo13[0]) === null || _currentNodeDetail$wo14 === void 0 ? void 0 : _currentNodeDetail$wo14.account) : '',
+    showWithdraw: isArtificialNode && (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo15 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo15 === void 0 ? void 0 : _currentNodeDetail$wo15.flowStatus) === FlowStatus.COMPLETED && isCurrentNodeHandler && !readonly,
+    showReminder: isArtificialNode && [NodeStatus.WAITING, NodeStatus.STOPPING].includes(currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo16 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo16 === void 0 ? void 0 : _currentNodeDetail$wo16.flowStatus) && isCurrentNodeHandler && !readonly,
+    isReminder: JSON.parse((currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo17 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo17 === void 0 ? void 0 : (_currentNodeDetail$wo18 = _currentNodeDetail$wo17.jsonMap) === null || _currentNodeDetail$wo18 === void 0 ? void 0 : _currentNodeDetail$wo18.flowTags) || '[]').includes('REMINDER'),
     handleWithdraw: handleWithdraw,
     handleReminder: onReminder,
     editing: editing,
     handleEdit: handleEdit,
-    handleSave: handleSave
+    handleSave: handleSave,
+    handleLabel: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo19 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo19 === void 0 ? void 0 : _currentNodeDetail$wo19.flowStatus) === FlowStatus.COMPLETED ? '完成人' : '处理人'
   }), /*#__PURE__*/React.createElement("div", {
     className: styles.formRenderContainer
   }, [NodeType.START_NODE, NodeType.EXECUTE_NODE].includes(currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no18 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no18 === void 0 ? void 0 : _currentNodeDetail$no18.nodeType) && (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo) && (flowStatus === FlowStatus.COMPLETED && !editing ? /*#__PURE__*/React.createElement(RenderDetail, {
@@ -243,7 +244,7 @@ var CurrentNode = function CurrentNode(props, ref) {
     templateDetail: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo,
     shopList: shopList,
     record: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrder,
-    shopId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo18 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo18 === void 0 ? void 0 : _currentNodeDetail$wo18.shopId) || plat.shopId || defaultShopId,
+    shopId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo20 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo20 === void 0 ? void 0 : _currentNodeDetail$wo20.shopId) || plat.shopId || defaultShopId,
     accountName: plat === null || plat === void 0 ? void 0 : plat.accountName,
     onOpenWangWang: onOpenWangWang,
     onUpdateRemark: onUpdateRemark,

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'].includes(nxt === null || nxt === void 0 ? void 0 : nxt.workOrderComponentType)) {
         cur.push(nxt === null || nxt === void 0 ? void 0 : nxt.uniqueKey);
       }
       return cur;
@@ -759,13 +756,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 +794,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 +817,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 +836,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 +850,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 +916,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 +1034,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 +1113,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/FlowTemplateDetail/components/Header/index.d.ts

@@ -17,6 +17,7 @@ interface HeaderProps {
     opening?: boolean;
     handler?: string;
     isReminder?: string;
+    handleLabel?: string;
 }
 declare const Header: (props: HeaderProps) => React.JSX.Element;
 export default Header;

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

@@ -26,7 +26,9 @@ var Header = function Header(props) {
     _props$showReminder = props.showReminder,
     showReminder = _props$showReminder === void 0 ? false : _props$showReminder,
     handler = props.handler,
-    isReminder = props.isReminder;
+    isReminder = props.isReminder,
+    _props$handleLabel = props.handleLabel,
+    handleLabel = _props$handleLabel === void 0 ? '处理人' : _props$handleLabel;
   return /*#__PURE__*/React.createElement("div", {
     className: styles.wrap
   }, (NODE_TYPE === null || NODE_TYPE === void 0 ? void 0 : NODE_TYPE[tag]) && /*#__PURE__*/React.createElement("div", {
@@ -34,12 +36,12 @@ var Header = function Header(props) {
   }, NODE_TYPE === null || NODE_TYPE === void 0 ? void 0 : (_NODE_TYPE$tag2 = NODE_TYPE[tag]) === null || _NODE_TYPE$tag2 === void 0 ? void 0 : _NODE_TYPE$tag2.label), /*#__PURE__*/React.createElement(Tooltip, {
     title: /*#__PURE__*/React.createElement("span", {
       className: "spanWrap"
-    }, "".concat(nodeName, " ").concat(handler ? "(\u5904\u7406\u4EBA: ".concat(handler, ")") : ''))
+    }, "".concat(nodeName, " ").concat(handler ? "(".concat(handleLabel, ": ").concat(handler, ")") : ''))
   }, /*#__PURE__*/React.createElement("span", {
     className: styles.nodeName
   }, /*#__PURE__*/React.createElement("span", null, nodeName), handler && /*#__PURE__*/React.createElement("span", {
     className: styles.handler
-  }, "(\u5904\u7406\u4EBA: ".concat(handler, ")")))), /*#__PURE__*/React.createElement("div", {
+  }, "(".concat(handleLabel, ": ").concat(handler, ")")))), /*#__PURE__*/React.createElement("div", {
     className: styles.loadingWrap
   }, /*#__PURE__*/React.createElement(Spin, {
     spinning: loading,

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

@@ -266,7 +266,8 @@ var NodeItem = function NodeItem(props) {
     loading: loading,
     handler: isArtificialNode ? handler : '',
     showWithdraw: showWithdraw,
-    showReminder: false
+    showReminder: false,
+    handleLabel: '完成人'
   }), /*#__PURE__*/React.createElement("div", {
     style: {
       display: open ? 'block' : 'none',

package/dist/esm/FlowTemplateDetail/index.js

@@ -1,5 +1,8 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+var _excluded = ["shopId"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -15,7 +18,7 @@ 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, { useEffect, useState, useRef, useMemo } from 'react';
-import { Timeline, ConfigProvider, Form, message, Alert, Button, Spin, Row, Col } from 'antd';
+import { Timeline, ConfigProvider, Form, message, Alert, Button, Spin, Row, Col, Popover } from 'antd';
 import { get, find, isEmpty } from 'lodash';
 import { useDispatch, useSelector, Provider, batch } from 'react-redux';
 import store from "../model/store";
@@ -40,8 +43,9 @@ import RemarkModal from "./components/RemarkModal";
 import WithdrawModal from "./components/WithdrawModal";
 import SubmitRemindModal from "./components/SubmitRemindModal";
 import { useSignal } from "../hooks/useSignal";
-import { verifyHandle, submitParams, FLOW_STATUS_V2, getTag, currentUserHasOperatorAuth } from "./common";
+import { verifyHandle, submitParams, FLOW_STATUS_V2, getTag, currentUserHasOperatorAuth, CANNOT_BACK_FILL } from "./common";
 import { saveWorkOrder, submitWorkOrder, addRemark, stopWorkOrder, closeWorkOrder, startWorkOrder, forwardWorkOrder, returnWorkOrder, withDrawWorkOrder, reminder, cancelReminder } from "../model/flowTemplateDetail/api";
+import RenderDetail from "./components/RenderDetail";
 import { orderDetail } from "../model/servers/api";
 import cache from "../common/cache";
 import "./index.less";
@@ -920,11 +924,14 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
   }();
 
   // 填充表单
-  var handleFillWorkOrder = function handleFillWorkOrder() {
-    var _currentNodeDetail$wo23, _currentNodeRef$curre, _currentNodeRef$curre2;
-    var transData = calcWorkOrderList([currentTradeIdLinkWorkOrderId === null || currentTradeIdLinkWorkOrderId === void 0 ? void 0 : currentTradeIdLinkWorkOrderId.lastWorkOrderDetail], (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo23 = currentNodeDetail.workOrderTemplateInfo) === null || _currentNodeDetail$wo23 === void 0 ? void 0 : _currentNodeDetail$wo23.componentDtoList) || []);
+  var handleFillWorkOrder = function handleFillWorkOrder(details) {
+    var _currentNodeRef$curre, _currentNodeRef$curre2;
+    //返填去掉店铺返填，防止端上覆盖店铺信息
+    var shopId = details.shopId,
+      ohter = _objectWithoutProperties(details, _excluded);
     var formData = form.getFieldsValue();
-    form.setFieldsValue(_objectSpread(_objectSpread({}, formData), get(transData, '0', {})));
+    form.setFieldsValue(_objectSpread(_objectSpread({}, formData), ohter));
+    message.success('填充成功');
     // 填充表单后触发映射
     (_currentNodeRef$curre = currentNodeRef.current) === null || _currentNodeRef$curre === void 0 ? void 0 : (_currentNodeRef$curre2 = _currentNodeRef$curre.batchFillByMapping) === null || _currentNodeRef$curre2 === void 0 ? void 0 : _currentNodeRef$curre2.call(_currentNodeRef$curre, form.getFieldsValue());
   };
@@ -958,21 +965,21 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
     dispatch(setPlat(plat));
   }, [plat]);
   useEffect(function () {
-    var _currentNodeDetail$wo24;
-    if (autoSubmit && !isNull(currentNodeDetail) && flowWorkOrderId === (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo24 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo24 === void 0 ? void 0 : _currentNodeDetail$wo24.flowWorkOrderId)) {
+    var _currentNodeDetail$wo23;
+    if (autoSubmit && !isNull(currentNodeDetail) && flowWorkOrderId === (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo23 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo23 === void 0 ? void 0 : _currentNodeDetail$wo23.flowWorkOrderId)) {
       setTimeout(function () {
         handleSubmit();
       }, 0);
     }
   }, [currentNodeDetail]);
   var isCurrentNodeHandler = useMemo(function () {
-    var _currentNodeDetail$no11, _currentNodeDetail$no12, _currentNodeDetail$no13, _currentNodeDetail$no14, _currentNodeDetail$no15, _currentNodeDetail$no16, _currentNodeDetail$wo25, _currentNodeDetail$no17, _currentNodeDetail$no18;
+    var _currentNodeDetail$no11, _currentNodeDetail$no12, _currentNodeDetail$no13, _currentNodeDetail$no14, _currentNodeDetail$no15, _currentNodeDetail$no16, _currentNodeDetail$wo24, _currentNodeDetail$no17, _currentNodeDetail$no18;
     return currentUserHasOperatorAuth({
       assistantList: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no11 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no11 === void 0 ? void 0 : _currentNodeDetail$no11.id) && assistantMap[currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no12 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no12 === void 0 ? void 0 : _currentNodeDetail$no12.id] || [],
       currentUserKey: plat.userKey,
       staffIds: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no13 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no13 === void 0 ? void 0 : (_currentNodeDetail$no14 = _currentNodeDetail$no13.assistants) === null || _currentNodeDetail$no14 === void 0 ? void 0 : _currentNodeDetail$no14.staffIds) || [],
       operateDataPermission: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no15 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no15 === void 0 ? void 0 : (_currentNodeDetail$no16 = _currentNodeDetail$no15.assistants) === null || _currentNodeDetail$no16 === void 0 ? void 0 : _currentNodeDetail$no16.operateDataPermission,
-      handlerList: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo25 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo25 === void 0 ? void 0 : _currentNodeDetail$wo25.handlerList) || [],
+      handlerList: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo24 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo24 === void 0 ? void 0 : _currentNodeDetail$wo24.handlerList) || [],
       isAllStaff: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no17 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no17 === void 0 ? void 0 : (_currentNodeDetail$no18 = _currentNodeDetail$no17.assistants) === null || _currentNodeDetail$no18 === void 0 ? void 0 : _currentNodeDetail$no18.isAllStaff
     });
   }, [currentNodeDetail, plat, assistantMap]);
@@ -980,6 +987,38 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
     var _currentNodeDetail$no19, _currentNodeDetail$no20;
     return item.accessToken === (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no19 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no19 === void 0 ? void 0 : (_currentNodeDetail$no20 = _currentNodeDetail$no19.relationEvent) === null || _currentNodeDetail$no20 === void 0 ? void 0 : _currentNodeDetail$no20.defaultShopUniqueKey);
   })) === null || _shopList$find === void 0 ? void 0 : _shopList$find.shopId;
+  var ReportOrderRender = function ReportOrderRender(props) {
+    var _currentNodeDetail$wo25, _currentNodeDetail$wo26;
+    var details = props.details;
+    var componentDtoList = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo25 = currentNodeDetail.workOrderTemplateInfo) === null || _currentNodeDetail$wo25 === void 0 ? void 0 : _currentNodeDetail$wo25.componentDtoList.filter(function (t) {
+      return !CANNOT_BACK_FILL.includes(t.workOrderComponentType || '');
+    });
+    //获取可以返填的组件值
+    var _calcWorkOrderList = calcWorkOrderList([details], componentDtoList),
+      _calcWorkOrderList2 = _slicedToArray(_calcWorkOrderList, 1),
+      transData = _calcWorkOrderList2[0];
+    //获取表单显示值
+    var _calcWorkOrderList3 = calcWorkOrderList([details], currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo26 = currentNodeDetail.workOrderTemplateInfo) === null || _currentNodeDetail$wo26 === void 0 ? void 0 : _currentNodeDetail$wo26.componentDtoList),
+      _calcWorkOrderList4 = _slicedToArray(_calcWorkOrderList3, 1),
+      transDataall = _calcWorkOrderList4[0];
+    return /*#__PURE__*/React.createElement("div", {
+      style: {
+        height: '50vh',
+        maxWidth: '800px',
+        overflow: 'auto'
+      }
+    }, /*#__PURE__*/React.createElement(Button, {
+      type: "link",
+      onClick: function onClick() {
+        return handleFillWorkOrder(transData);
+      }
+    }, "\u7ACB\u5373\u586B\u5145"), details.flowWorkOrderId, /*#__PURE__*/React.createElement(RenderDetail, {
+      workOrderTemplateInfo: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo,
+      transData: transDataall,
+      platform: plat.platform,
+      onOpenWangWang: onOpenWangWang
+    }));
+  };
   return /*#__PURE__*/React.createElement(Spin, {
     spinning: loading
   }, /*#__PURE__*/React.createElement("div", {
@@ -1014,12 +1053,16 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
   }, /*#__PURE__*/React.createElement(Alert, {
     type: "warning",
     showIcon: true,
-    description: /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("h4", null, "1.\u8BE5\u7B14\u8BA2\u5355\u5DF2\u7ECF\u521B\u5EFA\u8FC7", currentTradeIdLinkWorkOrderId.total, "\u7B14\u5DE5\u5355"), /*#__PURE__*/React.createElement("h4", null, "2.\u5982\u9700\u81EA\u52A8\u586B\u5145\u524D\u4E00\u4E2A\u8868\u5355\u4FE1\u606F\uFF0C\u8BF7\u70B9\u51FB", ' ', /*#__PURE__*/React.createElement(Button, {
-      type: "link",
-      onClick: handleFillWorkOrder,
-      className: "fillButton"
-    }, "\u7ACB\u5373\u586B\u5145")))
-  })), /*#__PURE__*/React.createElement(Timeline, null, flowRecordList === null || flowRecordList === void 0 ? void 0 : flowRecordList.map(function (flowRecord, index) {
+    description: /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("h4", null, "1.\u8BE5\u7B14\u8BA2\u5355\u5DF2\u7ECF\u521B\u5EFA\u8FC7", currentTradeIdLinkWorkOrderId.total, "\u7B14\u5DE5\u5355"), /*#__PURE__*/React.createElement("div", null, currentTradeIdLinkWorkOrderId.workOrderList.map(function (item) {
+      return /*#__PURE__*/React.createElement(Popover, {
+        content: /*#__PURE__*/React.createElement(ReportOrderRender, {
+          details: item
+        })
+      }, /*#__PURE__*/React.createElement(Button, {
+        type: "link"
+      }, item.flowWorkOrderId));
+    })))
+  })), /*#__PURE__*/React.createElement(Timeline, null, flowRecordList.map(function (flowRecord, index) {
     var canWithdraw = currentNodeCanWithdraw(index) && !readonly;
     return /*#__PURE__*/React.createElement(Timeline.Item, null, /*#__PURE__*/React.createElement(NodeItem, {
       flowTemplateId: flowTemplateId,

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";
@@ -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)));
@@ -1611,8 +1639,8 @@ 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));
       }
     }, {});
   };
@@ -1634,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, _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, _objectSpread57, _cacheOrderInfo;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -1739,6 +1767,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 +1777,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 +1842,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 +1860,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 +1873,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 +1904,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), {}, (_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);
           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 +2225,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

@@ -7,7 +7,7 @@ export declare const setFlowList: import("@reduxjs/toolkit").ActionCreatorWithPa
     [nodeId: string]: Assistant[];
 }, "flowTemplateDetail/setNodeAssistantInfo">, setTid: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, "flowTemplateDetail/setTid">, setShopUniqueKey: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, "flowTemplateDetail/setShopUniqueKey">, setRemarkList: import("@reduxjs/toolkit").ActionCreatorWithPayload<Remark[], "flowTemplateDetail/setRemarkList">, setCurrentNode: import("@reduxjs/toolkit").ActionCreatorWithPayload<CurrentNodeDetail, "flowTemplateDetail/setCurrentNode">, setAction: import("@reduxjs/toolkit").ActionCreatorWithOptionalPayload<ActionType, "flowTemplateDetail/setAction">, setVisibleRemarkList: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, "flowTemplateDetail/setVisibleRemarkList">, setPlat: import("@reduxjs/toolkit").ActionCreatorWithPayload<PlatFormInfo, "flowTemplateDetail/setPlat">, setOperateParams: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "flowTemplateDetail/setOperateParams">, setAddRemarkVisible: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, "flowTemplateDetail/setAddRemarkVisible">, setFlowStatus: import("@reduxjs/toolkit").ActionCreatorWithPayload<FlowStatus, "flowTemplateDetail/setFlowStatus">, setCurrentTradeIdWOrkOrderNumber: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     total: number;
-    lastWorkOrderDetail: any;
+    workOrderList: 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">, setLabelList: import("@reduxjs/toolkit").ActionCreatorWithPayload<string[], "flowTemplateDetail/setLabelList">, clearLabelList: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"flowTemplateDetail/clearLabelList">;

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

@@ -32,7 +32,7 @@ export var initialState = {
   flowTemplateId: undefined,
   currentTradeIdLinkWorkOrder: {
     total: 0,
-    lastWorkOrderDetail: undefined
+    workOrderList: undefined
   },
   currentFlowAllShowHideRules: {},
   withdrawWorkOrderDetail: {
@@ -46,7 +46,7 @@ export var initialState = {
 export var fetchPanelInfo = function fetchPanelInfo(params, options) {
   return /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(dispatch) {
-      var res, _res$data, _res$data$flowRecordL, _res$data2, _res$data2$currentNod, _res$data2$currentNod2, _last, _res$data14, _currentNodeDetail$wo, _currentNodeDetail$no, _res$data15, _currentNodeDetail$no2, recordList, _recordList, currentNodeDetail, handlerList, assistants, _res$data16, _currentNodeDetail$no3, assistantRes, _assistantRes$data;
+      var res, _res$data, _res$data$flowRecordL, _res$data$flowRecordL2, _res$data2, _res$data2$currentNod, _res$data2$currentNod2, _last, _res$data14, _currentNodeDetail$wo, _currentNodeDetail$no, _res$data15, _currentNodeDetail$no2, recordList, _recordList, currentNodeDetail, handlerList, assistants, _res$data16, _currentNodeDetail$no3, assistantRes, _assistantRes$data;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -60,7 +60,9 @@ export var fetchPanelInfo = function fetchPanelInfo(params, options) {
               _context.next = 17;
               break;
             }
-            recordList = res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : (_res$data$flowRecordL = _res$data.flowRecordList) === null || _res$data$flowRecordL === void 0 ? void 0 : _res$data$flowRecordL.map(function (item) {
+            recordList = res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : (_res$data$flowRecordL = _res$data.flowRecordList) === null || _res$data$flowRecordL === void 0 ? void 0 : (_res$data$flowRecordL2 = _res$data$flowRecordL.filter(function (t) {
+              return t.operateType === 'PASS';
+            })) === null || _res$data$flowRecordL2 === void 0 ? void 0 : _res$data$flowRecordL2.map(function (item) {
               var tag = 'artificial'; // 人工节点
               // 先判断是什么节点类型 步骤/判断
               if (item.nodeType === NodeType.SWITCH_NODE) {
@@ -74,7 +76,8 @@ export var fetchPanelInfo = function fetchPanelInfo(params, options) {
                 nodeName: item.nodeName || '',
                 tag: tag,
                 operator: item.operator || '',
-                nodeIsAuto: item.nodeIsAuto
+                nodeIsAuto: item.nodeIsAuto,
+                operateType: item.operateType
               };
             }); // TODO: 针对已完结工单 会出现多一个最后节点问题；需要当前节点id和记录列表中最后一条比对，如果相同，则移除记录中最后一条；
             if ((res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : (_res$data2$currentNod = _res$data2.currentNodeDetail) === null || _res$data2$currentNod === void 0 ? void 0 : (_res$data2$currentNod2 = _res$data2$currentNod.nodeInfo) === null || _res$data2$currentNod2 === void 0 ? void 0 : _res$data2$currentNod2.id) === ((_last = last(recordList)) === null || _last === void 0 ? void 0 : _last.nodeId)) {
@@ -193,7 +196,7 @@ export var fetchAllFlowOperateRecord = function fetchAllFlowOperateRecord(params
 export var fetchCurrentTradeIdLinkWorkOrder = function fetchCurrentTradeIdLinkWorkOrder(params) {
   return /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(dispatch) {
-      var res, _res$data18, _res$data19, _res$data19$list, total, detail;
+      var res, _res$data18, _res$data19, total, list;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
@@ -205,10 +208,10 @@ export var fetchCurrentTradeIdLinkWorkOrder = function fetchCurrentTradeIdLinkWo
             res = _context3.sent;
             if (res.success) {
               total = (res === null || res === void 0 ? void 0 : (_res$data18 = res.data) === null || _res$data18 === void 0 ? void 0 : _res$data18.total) || 0;
-              detail = res === null || res === void 0 ? void 0 : (_res$data19 = res.data) === null || _res$data19 === void 0 ? void 0 : (_res$data19$list = _res$data19.list) === null || _res$data19$list === void 0 ? void 0 : _res$data19$list[0];
+              list = (res === null || res === void 0 ? void 0 : (_res$data19 = res.data) === null || _res$data19 === void 0 ? void 0 : _res$data19.list) || [];
               dispatch(setCurrentTradeIdWOrkOrderNumber({
                 total: total,
-                lastWorkOrderDetail: detail
+                workOrderList: list
               }));
             }
             _context3.next = 11;

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

@@ -615,10 +615,10 @@ export declare const selectCurrentTradeIdWOrkOrderNumber: ((state: {
     flowWOrkOrderDetail: import("./types").FlowTemplateDetailState;
 }) => {
     total: number;
-    lastWorkOrderDetail: any;
+    workOrderList: any[];
 }) & import("reselect").OutputSelectorFields<(args_0: import("./types").FlowTemplateDetailState) => {
     total: number;
-    lastWorkOrderDetail: any;
+    workOrderList: any[];
 }, {
     clearCache: () => void;
 }> & {

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

@@ -4,6 +4,7 @@ export interface Line {
     tag: string;
     operator: string;
     nodeIsAuto: boolean;
+    operateType: string;
 }
 export interface Assistant {
     id: string;
@@ -52,7 +53,7 @@ export interface FlowTemplateDetailState {
     flowTemplateId: string | undefined;
     currentTradeIdLinkWorkOrder: {
         total: number;
-        lastWorkOrderDetail: any;
+        workOrderList: any[];
     };
     currentFlowAllShowHideRules: CurrentFlowShowHideRules;
     withdrawWorkOrderDetail: {

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,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
-  "version": "1.3.0",
+  "version": "1.4.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.3.0",
-    "@kmkf-fe-packages/kmkf-utils": "1.3.0",
-    "@kmkf-fe-packages/services-components": "1.3.0",
+    "@kmkf-fe-packages/basic-components": "1.4.0-rc.0",
+    "@kmkf-fe-packages/kmkf-utils": "1.4.0-rc.0",
+    "@kmkf-fe-packages/services-components": "1.4.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": "227e5e52ad4e85074c0486fea308033557d75a6e",
+  "gitHead": "6ecec78fdd7fa5eb426bf0d8092953a3ecb94b1f",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }