@kmkf-fe-packages/kmkf-work-order-service-component 1.19.10 → 1.20.0

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

@@ -695,7 +695,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', 'WDT_RETURN_GOODS', 'WDT_EXCHANGE_GOODS', 'KM_SEND_GOOD', 'BS_E3_SYSTEM_ORDER'].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', 'BS_E3_SYSTEM_ORDER', 'BS_E3_REISSUE_GOODS'].includes(nxt === null || nxt === void 0 ? void 0 : nxt.workOrderComponentType)) {
         cur.push(nxt === null || nxt === void 0 ? void 0 : nxt.uniqueKey);
       }
       return cur;

package/dist/esm/FlowTemplateDetailV2/index.d.ts

@@ -10,7 +10,7 @@ declare type FlowTemplateDetailProps = {
     privilege?: boolean;
     onOpenWangWang?: (nick: string, id: string) => void;
     callbackDealWorkOrderSuccess?: (type: string, workOrderId?: string) => void;
-    onJumpMemoPage?: () => void;
+    onJumpPage?: (val: any) => void;
     onTalkChange?: (data: {
         tid: string;
         shopId: string;

package/dist/esm/FlowTemplateDetailV2/index.js

@@ -18,7 +18,8 @@ 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, useContext } from 'react';
-import { Timeline, ConfigProvider, Form, message, Alert, Button, Spin, Row, Col, Popover } from 'antd';
+import { Timeline, ConfigProvider, Form, message, Alert, Button, Spin, Row, Col, Popover, Typography } from 'antd';
+import { InfoCircleOutlined } from '@ant-design/icons';
 import { get, find, isEmpty } from 'lodash';
 import { batch } from 'react-redux';
 import zhCN from 'antd/es/locale/zh_CN';
@@ -50,8 +51,11 @@ import { orderDetail } from "../model/servers/api";
 import cache from "../common/cache";
 import "./index.less";
 import { isNull } from '@kmkf-fe-packages/kmkf-utils';
+import { PlatformAvatar } from '@kmkf-fe-packages/services-components';
 import { Provide, Context } from "./context";
 import { useSelector } from "./context/useSelector";
+var Text = Typography.Text,
+  Link = Typography.Link;
 var FlowTemplateDetail = function FlowTemplateDetail(props) {
   var _currentNodeDetail$wo, _currentNodeDetail$no, _currentNodeDetail$wo2, _shopList$find, _currentNodeDetail$no21, _currentNodeDetail$no22, _currentNodeDetail$no23, _currentNodeDetail$no24;
   var flowTemplateKey = props.flowTemplateKey,
@@ -64,7 +68,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
     privilege = props.privilege,
     onOpenWangWang = props.onOpenWangWang,
     callbackDealWorkOrderSuccess = props.callbackDealWorkOrderSuccess,
-    onJumpMemoPage = props.onJumpMemoPage,
+    onJumpPage = props.onJumpPage,
     onTalkChange = props.onTalkChange,
     _props$autoSubmit = props.autoSubmit,
     autoSubmit = _props$autoSubmit === void 0 ? false : _props$autoSubmit,
@@ -149,7 +153,11 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
     isShowRemark = !shop.notJoin && !!shop.shopSourceStr && !readonly && ['TAOBAO', 'JD', 'PDD', 'KS', 'FXG'].includes(shop.shopSourceStr);
     shopSourceStr = shop.shopSourceStr;
   }
-
+  var shopItem = useMemo(function () {
+    return shopList.find(function (t) {
+      return t.shopId === (plat === null || plat === void 0 ? void 0 : plat.shopId);
+    });
+  }, [shopId]);
   // 提交请求锁
   var submitRequestLock = useRef(false);
   // 保存请求锁
@@ -563,7 +571,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
       return (_t$componentConfig = t.componentConfig) === null || _t$componentConfig === void 0 ? void 0 : _t$componentConfig.repeatCheck;
     });
     if (replaceValue && componentList.length) {
-      var val = Object.keys(COMPONENT_MAP).reduce(function (prv, key) {
+      var _val = Object.keys(COMPONENT_MAP).reduce(function (prv, key) {
         if (replaceValue[key]) {
           prv[COMPONENT_MAP[key]] = replaceValue[key];
         }
@@ -571,7 +579,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
       }, {});
       return componentList.some(function (item) {
         var _item$workOrderCompon;
-        return val[(_item$workOrderCompon = item === null || item === void 0 ? void 0 : item.workOrderComponentType) !== null && _item$workOrderCompon !== void 0 ? _item$workOrderCompon : ''];
+        return _val[(_item$workOrderCompon = item === null || item === void 0 ? void 0 : item.workOrderComponentType) !== null && _item$workOrderCompon !== void 0 ? _item$workOrderCompon : ''];
       });
     } else {
       return false;
@@ -1127,18 +1135,50 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
       onOpenWangWang: onOpenWangWang
     }));
   };
+  var VersionText = function VersionText() {
+    var _operateParams$maxPub2, _operateParams$maxPub3;
+    return /*#__PURE__*/React.createElement(Text, {
+      type: "secondary"
+    }, /*#__PURE__*/React.createElement(InfoCircleOutlined, null), "\u5F53\u524D\u5DE5\u5355\u6240\u5C5E\u6D41\u7A0B", plat.platform === 'pc' ? /*#__PURE__*/React.createElement(Link, {
+      style: {
+        cursor: 'pointer'
+      },
+      onClick: function onClick() {
+        return onJumpPage === null || onJumpPage === void 0 ? void 0 : onJumpPage({
+          type: 'version',
+          flowTemplateId: flowTemplateId
+        });
+      }
+    }, "v", operateParams === null || operateParams === void 0 ? void 0 : operateParams.flowVersion, "\u7248") : "v".concat(operateParams === null || operateParams === void 0 ? void 0 : operateParams.flowVersion, "\u7248"), "\uFF0C\u76EE\u524D\u6700\u65B0\u6D41\u7A0B", plat.platform === 'pc' ? /*#__PURE__*/React.createElement(Link, {
+      style: {
+        cursor: 'pointer'
+      },
+      onClick: function onClick() {
+        var _operateParams$maxPub;
+        return onJumpPage === null || onJumpPage === void 0 ? void 0 : onJumpPage({
+          type: 'version',
+          flowTemplateId: operateParams === null || operateParams === void 0 ? void 0 : (_operateParams$maxPub = operateParams.maxPublishVersionTemplate) === null || _operateParams$maxPub === void 0 ? void 0 : _operateParams$maxPub.id
+        });
+      }
+    }, "v", operateParams === null || operateParams === void 0 ? void 0 : (_operateParams$maxPub2 = operateParams.maxPublishVersionTemplate) === null || _operateParams$maxPub2 === void 0 ? void 0 : _operateParams$maxPub2.version, "\u7248") : "v".concat(operateParams === null || operateParams === void 0 ? void 0 : (_operateParams$maxPub3 = operateParams.maxPublishVersionTemplate) === null || _operateParams$maxPub3 === void 0 ? void 0 : _operateParams$maxPub3.version, "\u7248"));
+  };
   return /*#__PURE__*/React.createElement(Spin, {
     spinning: loading
   }, /*#__PURE__*/React.createElement("div", {
     className: "flowWorkOrderDetail"
-  }, flowStatus && /*#__PURE__*/React.createElement(Row, {
+  }, flowWorkOrderId && /*#__PURE__*/React.createElement("div", null, plat.platform === 'pc' && /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement(PlatformAvatar, {
+    type: shopItem === null || shopItem === void 0 ? void 0 : shopItem.shopSource,
+    styles: {
+      marginRight: 5
+    }
+  }), shopItem === null || shopItem === void 0 ? void 0 : shopItem.shopName, "-"), /*#__PURE__*/React.createElement("span", null, flowWorkOrderId)), flowStatus && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Row, {
     justify: 'space-between',
     className: "header"
   }, /*#__PURE__*/React.createElement(Col, null, /*#__PURE__*/React.createElement("div", {
     className: "statusWrap"
   }, "\u6D41\u7A0B\u72B6\u6001\uFF1A", /*#__PURE__*/React.createElement("div", {
     className: "status ".concat(flowStatus)
-  }), /*#__PURE__*/React.createElement("span", null, FLOW_STATUS_V2[flowStatus]))), flowTemplateType !== 'SINGLE_PAGE' && /*#__PURE__*/React.createElement(Col, {
+  }), /*#__PURE__*/React.createElement("span", null, FLOW_STATUS_V2[flowStatus]), plat.platform === 'pc' ? VersionText() : '')), flowTemplateType !== 'SINGLE_PAGE' && /*#__PURE__*/React.createElement(Col, {
     style: {
       position: 'relative',
       zIndex: 1,
@@ -1154,8 +1194,8 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
     onClick: function onClick() {
       return setOpenCloseVisible('close');
     }
-  }, "\u6536\u8D77\u5168\u90E8"))), /*#__PURE__*/React.createElement("div", {
-    className: "center ".concat(flowStatus ? 'hasStatus' : '', " ").concat(readonly ? 'readonly' : '')
+  }, "\u6536\u8D77\u5168\u90E8"))), plat.platform !== 'pc' ? VersionText() : ''), /*#__PURE__*/React.createElement("div", {
+    className: "center ".concat(readonly ? 'readonly' : '')
   }, currentTradeIdLinkWorkOrderId.total > 0 && /*#__PURE__*/React.createElement("div", {
     className: "alertRepeatTradeId"
   }, /*#__PURE__*/React.createElement(Alert, {
@@ -1226,7 +1266,11 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
     form: form,
     orderRemarkObj: orderRemarkObj,
     plat: plat,
-    onJumpMemoPage: onJumpMemoPage
+    onJumpMemoPage: function onJumpMemoPage() {
+      return onJumpPage === null || onJumpPage === void 0 ? void 0 : onJumpPage({
+        type: 'memo'
+      });
+    }
   }), /*#__PURE__*/React.createElement(RemarkListModal, null), /*#__PURE__*/React.createElement(ForWardModal, {
     flowTemplateId: flowTemplateId,
     nodeId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no23 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no23 === void 0 ? void 0 : _currentNodeDetail$no23.id,

package/dist/esm/FlowTemplateDetailV2/index.less

@@ -7,15 +7,16 @@
   }
   .header {
     background: #FFF;
-    height: 24px;
+    min-height: 24px;
     width: 100%;
-    margin-bottom: 8px;
+    // margin-bottom: 8px;
     box-sizing: content-box;
     z-index: 99;
-    padding: 8px;
+    // padding: 8px;
     .statusWrap {
       display: flex;
       align-items: center;
+      flex-wrap: wrap;
       > span {
         margin-left: 8px;
       }

package/dist/esm/FlowTemplateDetailV2/store/reducers.d.ts

@@ -53,6 +53,12 @@ declare const reducers: (state: FlowTemplateDetailState | undefined, action: {
         flowVersion: number;
         flowWorkOrderUpdateTime: string;
         workOrderUpdateTime: number;
+        maxPublishVersionTemplate: {
+            id: string;
+            name: string;
+            publishTime: number;
+            version: number;
+        };
     } | undefined;
     addRemarkVisible: boolean;
     flowStatus: FlowStatus | undefined;

package/dist/esm/FlowTemplateDetailV2/store/reducers.js

@@ -45,7 +45,7 @@ export var initState = {
 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$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;
+      var res, _res$data, _res$data$flowRecordL, _res$data$flowRecordL2, _res$data2, _res$data2$currentNod, _res$data2$currentNod2, _last, _res$data15, _currentNodeDetail$wo, _currentNodeDetail$no, _res$data16, _currentNodeDetail$no2, recordList, _recordList, currentNodeDetail, handlerList, assistants, _res$data17, _currentNodeDetail$no3, assistantRes, _assistantRes$data;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -86,7 +86,7 @@ export var fetchPanelInfo = function fetchPanelInfo(params, options) {
               recordList = (_recordList = recordList) === null || _recordList === void 0 ? void 0 : _recordList.slice(0, -1);
             }
             unstable_batchedUpdates(function () {
-              var _res$data3, _res$data4, _res$data5, _res$data6, _res$data7, _res$data8, _res$data9, _res$data10, _res$data11, _res$data12, _res$data13;
+              var _res$data3, _res$data4, _res$data5, _res$data6, _res$data7, _res$data8, _res$data9, _res$data10, _res$data11, _res$data12, _res$data13, _res$data14;
               dispatch({
                 type: 'setFlowList',
                 payload: recordList || []
@@ -111,42 +111,43 @@ export var fetchPanelInfo = function fetchPanelInfo(params, options) {
                   flowTemplateKey: res === null || res === void 0 ? void 0 : (_res$data6 = res.data) === null || _res$data6 === void 0 ? void 0 : _res$data6.flowTemplateKey,
                   flowVersion: res === null || res === void 0 ? void 0 : (_res$data7 = res.data) === null || _res$data7 === void 0 ? void 0 : _res$data7.flowVersion,
                   flowWorkOrderUpdateTime: res === null || res === void 0 ? void 0 : (_res$data8 = res.data) === null || _res$data8 === void 0 ? void 0 : _res$data8.flowWorkOrderUpdateTime,
-                  workOrderUpdateTime: res === null || res === void 0 ? void 0 : (_res$data9 = res.data) === null || _res$data9 === void 0 ? void 0 : _res$data9.workOrderUpdateTime
+                  workOrderUpdateTime: res === null || res === void 0 ? void 0 : (_res$data9 = res.data) === null || _res$data9 === void 0 ? void 0 : _res$data9.workOrderUpdateTime,
+                  maxPublishVersionTemplate: res === null || res === void 0 ? void 0 : (_res$data10 = res.data) === null || _res$data10 === void 0 ? void 0 : _res$data10.maxPublishVersionTemplate
                 }
               });
               dispatch({
                 type: 'setFlowTemplateType',
-                payload: res === null || res === void 0 ? void 0 : (_res$data10 = res.data) === null || _res$data10 === void 0 ? void 0 : _res$data10.flowTemplateType
+                payload: res === null || res === void 0 ? void 0 : (_res$data11 = res.data) === null || _res$data11 === void 0 ? void 0 : _res$data11.flowTemplateType
               });
               dispatch({
                 type: 'setFlowStatus',
-                payload: res === null || res === void 0 ? void 0 : (_res$data11 = res.data) === null || _res$data11 === void 0 ? void 0 : _res$data11.flowStatus
+                payload: res === null || res === void 0 ? void 0 : (_res$data12 = res.data) === null || _res$data12 === void 0 ? void 0 : _res$data12.flowStatus
               });
               dispatch({
                 type: 'setFlowTemplateId',
-                payload: (res === null || res === void 0 ? void 0 : (_res$data12 = res.data) === null || _res$data12 === void 0 ? void 0 : _res$data12.flowTemplateId) || ''
+                payload: (res === null || res === void 0 ? void 0 : (_res$data13 = res.data) === null || _res$data13 === void 0 ? void 0 : _res$data13.flowTemplateId) || ''
               });
               dispatch({
                 type: 'setCurrentFlowAllShowHideRules',
                 payload: {
-                  allShowHideRules: res === null || res === void 0 ? void 0 : (_res$data13 = res.data) === null || _res$data13 === void 0 ? void 0 : _res$data13.allShowHideRules
+                  allShowHideRules: res === null || res === void 0 ? void 0 : (_res$data14 = res.data) === null || _res$data14 === void 0 ? void 0 : _res$data14.allShowHideRules
                 }
               });
             });
             // 如果
-            currentNodeDetail = res === null || res === void 0 ? void 0 : (_res$data14 = res.data) === null || _res$data14 === void 0 ? void 0 : _res$data14.currentNodeDetail;
+            currentNodeDetail = res === null || res === void 0 ? void 0 : (_res$data15 = res.data) === null || _res$data15 === void 0 ? void 0 : _res$data15.currentNodeDetail;
             handlerList = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo === void 0 ? void 0 : _currentNodeDetail$wo.handlerList;
             assistants = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no === void 0 ? void 0 : _currentNodeDetail$no.assistants;
             if (!(Array.isArray(handlerList) && handlerList.length &&
             // 有处理人
             !(assistants !== null && assistants !== void 0 && assistants.isAllStaff) && // 不是所有人都能处理，查询能够处理的人
-            res !== null && res !== void 0 && (_res$data15 = res.data) !== null && _res$data15 !== void 0 && _res$data15.flowTemplateId && currentNodeDetail !== null && currentNodeDetail !== void 0 && (_currentNodeDetail$no2 = currentNodeDetail.nodeInfo) !== null && _currentNodeDetail$no2 !== void 0 && _currentNodeDetail$no2.id)) {
+            res !== null && res !== void 0 && (_res$data16 = res.data) !== null && _res$data16 !== void 0 && _res$data16.flowTemplateId && currentNodeDetail !== null && currentNodeDetail !== void 0 && (_currentNodeDetail$no2 = currentNodeDetail.nodeInfo) !== null && _currentNodeDetail$no2 !== void 0 && _currentNodeDetail$no2.id)) {
               _context.next = 17;
               break;
             }
             _context.next = 15;
             return queryMultiNodeAssistantInfo([{
-              flowTemplateId: res === null || res === void 0 ? void 0 : (_res$data16 = res.data) === null || _res$data16 === void 0 ? void 0 : _res$data16.flowTemplateId,
+              flowTemplateId: res === null || res === void 0 ? void 0 : (_res$data17 = res.data) === null || _res$data17 === void 0 ? void 0 : _res$data17.flowTemplateId,
               currentNodeId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no3 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no3 === void 0 ? void 0 : _currentNodeDetail$no3.id
             }]);
           case 15:
@@ -185,7 +186,7 @@ export var fetchPanelInfo = function fetchPanelInfo(params, options) {
 export var fetchAllFlowOperateRecord = function fetchAllFlowOperateRecord(params) {
   return /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(dispatch) {
-      var res, _res$data17, list;
+      var res, _res$data18, list;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -199,7 +200,7 @@ export var fetchAllFlowOperateRecord = function fetchAllFlowOperateRecord(params
           case 4:
             res = _context2.sent;
             if (res.success) {
-              list = res === null || res === void 0 ? void 0 : (_res$data17 = res.data) === null || _res$data17 === void 0 ? void 0 : _res$data17.map(function (item) {
+              list = res === null || res === void 0 ? void 0 : (_res$data18 = res.data) === null || _res$data18 === void 0 ? void 0 : _res$data18.map(function (item) {
                 return _objectSpread(_objectSpread({}, item), {}, {
                   time: (item === null || item === void 0 ? void 0 : item.created) || '',
                   operator: (item === null || item === void 0 ? void 0 : item.operator) || '',
@@ -240,7 +241,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, total, list;
+      var res, _res$data19, _res$data20, total, list;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
@@ -254,8 +255,8 @@ export var fetchCurrentTradeIdLinkWorkOrder = function fetchCurrentTradeIdLinkWo
           case 4:
             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;
-              list = (res === null || res === void 0 ? void 0 : (_res$data19 = res.data) === null || _res$data19 === void 0 ? void 0 : _res$data19.list) || [];
+              total = (res === null || res === void 0 ? void 0 : (_res$data19 = res.data) === null || _res$data19 === void 0 ? void 0 : _res$data19.total) || 0;
+              list = (res === null || res === void 0 ? void 0 : (_res$data20 = res.data) === null || _res$data20 === void 0 ? void 0 : _res$data20.list) || [];
               dispatch({
                 type: 'setCurrentTradeIdWOrkOrderNumber',
                 payload: {

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

@@ -1051,6 +1051,33 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
         }),
         name: item.name
       });
+    } else if (['BS_E3_REISSUE_GOODS'].includes(item.workOrderComponentType)) {
+      contentVoList.push({
+        uniqueKey: "".concat(item.uniqueKey, "_bsE3SystemOrderNo"),
+        content: get(nowData, "".concat(item.uniqueKey, ".bsE3SystemOrderNo"), ''),
+        name: item.name
+      }, {
+        uniqueKey: "".concat(item.uniqueKey, "_bsE3ReissueType"),
+        content: get(nowData, "".concat(item.uniqueKey, ".bsE3ReissueType"), ''),
+        name: item.name
+      }, {
+        uniqueKey: "".concat(item.uniqueKey, "_bsE3ReissueMemo"),
+        content: get(nowData, "".concat(item.uniqueKey, ".bsE3ReissueMemo"), ''),
+        name: item.name
+      }, {
+        uniqueKey: "".concat(item.uniqueKey, "_bsE3ReissueGoods"),
+        content: get(nowData, "".concat(item.uniqueKey, ".bsE3ReissueGoods"), []),
+        //   ?.map((item: { isGift: string | undefined }) => {
+        //   if (typeof item.isGift === 'string') {
+        //     return {
+        //       ...item,
+        //       isGift: item.isGift === '是' ? 1 : 0
+        //     }
+        //   }
+        //   return item;
+        // }),
+        name: item.name
+      });
     } else if (item.workOrderComponentType === 'BUYER_MESSAGE_NOTICE') {
       var _nowData$item$uniqueK;
       contentVoList.push({
@@ -1223,7 +1250,7 @@ export var orderBack = /*#__PURE__*/function () {
             return !item.notJoin && item.shopId == shopId;
           }); //判断是否有百胜组件 有就请求bs订单接口
           hasBs = HasFilterHandle(templateDetail, ['BS_SIGNING_TIME', 'BS_SEND_TIME', 'BS_TRADE_PAYMENT_TIME', 'BS_NET_RECEIPTS', 'BS_PACKAGE_WEIGHT', 'BS_GOODS', 'BS_DEPOSIT', 'BS_LOGISTICS', 'BS_SEND_GOOD', 'BS_POSTING', 'BS_SYSTEM_ORDER', 'BS_DELIVERY_NO']); //判断是否有旺店通组件 有就请求wdt订单接口
-          hasWdt = HasFilterHandle(templateDetail, ['WDT_SYSTEM_ORDER', 'WDT_GOODS', 'WDT_LOGISTICS', 'WDT_SEND_GOOD'
+          hasWdt = HasFilterHandle(templateDetail, ['WDT_SYSTEM_ORDER', 'WDT_GOODS', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WDT_REISSUE_GOODS'
           // 'WDT_SIGNING_TIME',
           // 'WDT_SEND_TIME',
           // 'WDT_TRADE_PAYMENT_TIME',
@@ -1233,9 +1260,9 @@ export var orderBack = /*#__PURE__*/function () {
           // 'WDT_POSTING',
           // 'WDT_DELIVERY_NO',
           ]); // 判断是否有旺店通组件 有就请求bsE3订单接口
-          hasBsE3 = HasFilterHandle(templateDetail, ['BS_E3_SYSTEM_ORDER', 'BS_E3_GOODS']); //判断是否有万里牛组件 有就请求wln订单接口
+          hasBsE3 = HasFilterHandle(templateDetail, ['BS_E3_SYSTEM_ORDER', 'BS_E3_GOODS', 'BS_E3_REISSUE_GOODS']); //判断是否有万里牛组件 有就请求wln订单接口
           hasWln = HasFilterHandle(templateDetail, ['WLN_SYSTEM_ORDER', 'WLN_GOODS', 'WLN_LOGISTICS', 'WLN_SEND_GOOD']); //如果不是对接店铺且百胜组件都没有
-          if (!(!JOIN_SHOP && !hasBs && !hasWln && !hasWdt)) {
+          if (!(!JOIN_SHOP && !hasBs && !hasWln && !hasWdt && !hasBsE3)) {
             _context.next = 8;
             break;
           }

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

@@ -669,6 +669,27 @@ var processSingleField = function processSingleField(getValue) {
     return _defineProperty({}, nex.uniqueKey, getValue("".concat(nex.uniqueKey, "_").concat(updateWorkTypeKeys[nex.workOrderComponentType])));
   };
 };
+var processBsE3ReissueGoods = function processBsE3ReissueGoods(templateColumns) {
+  return function (getValue) {
+    return function (nex, config) {
+      var orderNo = '';
+      var tradeId = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
+        return col.workOrderComponentType === 'TRADE_ID_INPUT';
+      });
+      if (tradeId) {
+        orderNo = getValue("".concat(tradeId.uniqueKey, "_").concat(updateWorkTypeKeys[tradeId.workOrderComponentType]));
+      }
+      return _defineProperty({}, nex.uniqueKey, {
+        bsE3SystemOrder: {
+          orderNo: orderNo
+        },
+        bsE3SystemOrderNo: getValue("".concat(nex.uniqueKey, "_bsE3SystemOrderNo")),
+        bsE3ReissueType: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_bsE3ReissueType")), ['1']),
+        bsE3ReissueGoods: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_bsE3ReissueGoods")), [])
+      });
+    };
+  };
+};
 var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
   var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'edit';
   return function (item) {
@@ -771,7 +792,8 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
       BS_DEPOSIT: processSingleField,
       NEW_PAYMENT_STATUS: processSingleField,
       BUSINESS_ORDER_NO: processSingleField,
-      PAYMENT_VOUCHER_CODE: processSingleField
+      PAYMENT_VOUCHER_CODE: processSingleField,
+      BS_E3_REISSUE_GOODS: processBsE3ReissueGoods(templateColumns)
     };
     return templateColumns.reduce(function (cur, nex) {
       var config = type === 'init' ? nex.componentConfig : {};

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

@@ -47,6 +47,12 @@ export interface FlowTemplateDetailState {
         flowVersion: number;
         flowWorkOrderUpdateTime: string;
         workOrderUpdateTime: number;
+        maxPublishVersionTemplate: {
+            id: string;
+            name: string;
+            publishTime: number;
+            version: number;
+        };
     };
     addRemarkVisible: boolean;
     flowStatus: FlowStatus | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
-  "version": "1.19.10",
+  "version": "1.20.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.19.10",
-    "@kmkf-fe-packages/kmkf-utils": "1.19.10",
-    "@kmkf-fe-packages/services-components": "1.19.10",
+    "@kmkf-fe-packages/basic-components": "1.20.0",
+    "@kmkf-fe-packages/kmkf-utils": "1.20.0",
+    "@kmkf-fe-packages/services-components": "1.20.0",
     "@reduxjs/toolkit": "^1.8.5",
     "ahooks": "^3.7.4",
     "copy-to-clipboard": "^3.3.3",
@@ -73,7 +73,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "bff4020e7575d9c52239ac100cdcf4d44df91c83",
+  "gitHead": "885c4ea232f39e0dde8083ffe34a8305dc616d26",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }