@kmkf-fe-packages/kmkf-work-order-service-component 2.2.13-beta.3 → 2.2.13-beta.31

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

@@ -6,7 +6,7 @@ import { get } from 'lodash';
 import { onBlurSkxLogisticsCode, onBlurSkxOutboundNoticeNo, onBlurSkxReturnBillNo } from "./onBlur";
 import { findComponentUniqueKeyByType } from "../../../common/utils/tools";
 var isMatchCompanyKey = function isMatchCompanyKey(companyKey) {
-  return ['TR3E2FYXFZCFANVG6O6AALSM', 'SZF4ZGWZSNW6PYXMCIFEWBXT'].includes(companyKey);
+  return ['TR3E2FYXFZCFANVG6O6AALSM', 'SZF4ZGWZSNW6PYXMCIFEWBXT', '6O47IBXFR26FJF4HUQ7WGO4H'].includes(companyKey);
 };
 var existSkxReturnLogisticsComponent = function existSkxReturnLogisticsComponent(templateDetail) {
   return get(templateDetail, 'componentDtoList', []).some(function (item) {

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

@@ -56,12 +56,13 @@ var ShareLinkModal = /*#__PURE__*/forwardRef(function (props, ref) {
         flowWorkOrderId: info.flowWorkOrderId,
         flowNodeId: info.flowNodeId
       }).then(function (res) {
-        var _res$data, _res$data2;
+        var _res$data, _res$data2, _res$data3;
         if (res.data) {
           setVisible(true);
         }
         setUrl((_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.link);
-        setShortUrl((_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.shortShareLink);
+        var shortLink = (_res$data2 = res.data) !== null && _res$data2 !== void 0 && _res$data2.shortShareLink ? "".concat(window.location.protocol, "//").concat((_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.shortShareLink) : '';
+        setShortUrl(shortLink);
       });
       return;
     }
@@ -70,30 +71,33 @@ var ShareLinkModal = /*#__PURE__*/forwardRef(function (props, ref) {
         companyKey: info.companyKey,
         flowTemplateKey: info.flowTemplateKey
       }).then(function (res) {
-        var _res$data3, _res$data4;
+        var _res$data4, _res$data5, _res$data6;
         if (res.data) {
           setVisible(true);
         }
-        setUrl((_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.link);
-        setShortUrl((_res$data4 = res.data) === null || _res$data4 === void 0 ? void 0 : _res$data4.shortShareLink);
+        setUrl((_res$data4 = res.data) === null || _res$data4 === void 0 ? void 0 : _res$data4.link);
+        var shortLink = (_res$data5 = res.data) !== null && _res$data5 !== void 0 && _res$data5.shortShareLink ? "".concat(window.location.protocol, "//").concat((_res$data6 = res.data) === null || _res$data6 === void 0 ? void 0 : _res$data6.shortShareLink) : '';
+        setShortUrl(shortLink);
       });
       return;
     }
     setVisible(true);
+    var regex = /^(https?:\/\/)/;
     if (info.url) {
-      var regex = /^(https?:\/\/)/;
       var formatUrl = info.url.match(regex) ? info.url : "".concat(window.location.protocol, "//").concat(info.url);
       setUrl(formatUrl);
     }
     if ((info === null || info === void 0 ? void 0 : info.showType) !== 'shortUrl') return;
     if (info.shortUrl) {
-      setShortUrl(info.shortUrl);
+      var formaShortUrl = info.shortUrl.match(regex) ? info.shortUrl : "".concat(window.location.protocol, "//").concat(info.shortUrl);
+      setShortUrl(formaShortUrl);
     } else if (info.mongoId && info.url) {
       shortLink({
         mongoId: info.mongoId,
         longUrl: info.url
       }).then(function (res) {
-        setShortUrl(res.data);
+        var shortUrl = res.data ? "".concat(window.location.protocol, "//").concat(res.data) : '';
+        setShortUrl(shortUrl);
       });
     }
   };
@@ -149,7 +153,7 @@ var ShareLinkModal = /*#__PURE__*/forwardRef(function (props, ref) {
   }, "\u590D\u5236")), info.platform === 'pc' && /*#__PURE__*/React.createElement(Button, {
     type: "primary",
     onClick: function onClick() {
-      window.open("https://".concat(shortUrl));
+      window.open(shortUrl);
     }
   }, "\u6253\u5F00"))), /*#__PURE__*/React.createElement(Text, null, shortUrl))), /*#__PURE__*/React.createElement("li", {
     className: styles.shareLi

package/dist/esm/FlowTemplateDetailV2/index.js

@@ -27,7 +27,7 @@ import { calcWorkOrderList, deleteCacheOrder, submitParams } from "../common/uti
 import { useMemoizedFn } from 'ahooks';
 import moment from 'moment';
 import { fetchPanelInfo, fetchAllFlowOperateRecord, fetchCollectOrder, fetchShareNodeConfig, fetchH5SharePermission } from "./store/reducers";
-import { selectFlowRecordList, selectRemarkRecordList, selectCurrentNodeDetail, selectTid, selectShopUniqueKey, selectOperateParams, selectFlowStatus, selectCurrentTradeIdWOrkOrderNumber, selectFlowTemplateId, selectLoading, selectOrderBackLoading, selectOrderBackKmLoading, selectWithDrawOrder, selectNodeAssistantMap, selectFlowTemplateType, selectFollow, selectShowShareButton, selectH5SharePermission, selectAutoSubmitFlag } from "./store/selector";
+import { selectFlowRecordList, selectRemarkRecordList, selectCurrentNodeDetail, selectTid, selectShopUniqueKey, selectOperateParams, selectFlowStatus, selectCurrentTradeIdWOrkOrderNumber, selectFlowTemplateId, selectLoading, selectOrderBackLoading, selectOrderBackKmLoading, selectWithDrawOrder, selectNodeAssistantMap, selectFlowTemplateType, selectFollow, selectAutoSubmitFlag, selectShowShareButton, selectH5SharePermission } from "./store/selector";
 import { NodeType, FlowStatus, FlowType } from "../model/flowTemplateDetail/types";
 import NodeItem from "./components/Item";
 import CurrentNode from "./components/CurrentNode";
@@ -51,7 +51,6 @@ import RenderDetail from "./components/RenderDetail";
 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 { WORK_ORDER_STATUS_AI_BUILD } from "../common/constant";
@@ -1168,7 +1167,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
     }
   };
   useEffect(function () {
-    if (autoSubmit && !isNull(currentNodeDetail)) {
+    if (autoSubmit && !isEmpty(currentNodeDetail)) {
       var _currentNodeDetail$wo26, _currentNodeDetail$wo27;
       // SKX首节点满足下列条件、此时批量提交会等订单数据反填再提交, 其余企业批量提交还是原先逻辑，不涉及订单数据反填
       if (currentNodeDetail !== null && currentNodeDetail !== void 0 && (_currentNodeDetail$wo26 = currentNodeDetail.workOrder) !== null && _currentNodeDetail$wo26 !== void 0 && _currentNodeDetail$wo26.notAutoFillWithFirstSubmit && autoSubmitFlag) {

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

@@ -42,10 +42,10 @@ export declare const clearLabelList: (state: FlowTemplateDetailState) => void;
 export declare const setRejectLoading: (state: FlowTemplateDetailState, { payload }: PayloadAction<boolean>) => void;
 export declare const setWithDrawLoading: (state: FlowTemplateDetailState, { payload }: PayloadAction<boolean>) => void;
 export declare const setFollow: (state: FlowTemplateDetailState, { payload }: PayloadAction<boolean>) => void;
+export declare const setaAutoSubmitFlag: (state: FlowTemplateDetailState, { payload }: PayloadAction<boolean>) => void;
 export declare const setPrivilege: (state: FlowTemplateDetailState, { payload }: PayloadAction<string>) => void;
 export declare const setShowShareButton: (state: FlowTemplateDetailState, { payload }: PayloadAction<boolean>) => void;
 export declare const setH5SharePermission: (state: FlowTemplateDetailState, { payload }: PayloadAction<boolean>) => void;
-export declare const setaAutoSubmitFlag: (state: FlowTemplateDetailState, { payload }: PayloadAction<boolean>) => void;
 declare const reducers: (state: FlowTemplateDetailState | undefined, action: {
     type: string;
     payload: any;
@@ -92,9 +92,9 @@ declare const reducers: (state: FlowTemplateDetailState | undefined, action: {
     rejectLoading: boolean;
     withdrawLoading: boolean;
     follow: boolean;
+    autoSubmitFlag: boolean;
     privilege: string;
     showShareButton: boolean;
     hasH5SharePermission: boolean;
-    autoSubmitFlag: boolean;
 };
 export default reducers;

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

@@ -48,12 +48,12 @@ export var initState = {
   rejectLoading: false,
   withdrawLoading: false,
   follow: false,
+  autoSubmitFlag: false,
+  // 批量提交可操作标识
   privilege: '',
   showShareButton: false,
   //是否展示分享按钮
-  hasH5SharePermission: false,
-  //是否有h5分享权限
-  autoSubmitFlag: false // 批量提交可操作标识
+  hasH5SharePermission: false //是否有h5分享权限
 };
 
 export var fetchPanelInfo = function fetchPanelInfo(params, options) {
@@ -558,21 +558,21 @@ export var setFollow = function setFollow(state, _ref31) {
   var payload = _ref31.payload;
   state.follow = payload;
 };
-export var setPrivilege = function setPrivilege(state, _ref32) {
+export var setaAutoSubmitFlag = function setaAutoSubmitFlag(state, _ref32) {
   var payload = _ref32.payload;
-  state.privilege = payload;
+  state.autoSubmitFlag = payload;
 };
-export var setShowShareButton = function setShowShareButton(state, _ref33) {
+export var setPrivilege = function setPrivilege(state, _ref33) {
   var payload = _ref33.payload;
-  state.showShareButton = payload;
+  state.privilege = payload;
 };
-export var setH5SharePermission = function setH5SharePermission(state, _ref34) {
+export var setShowShareButton = function setShowShareButton(state, _ref34) {
   var payload = _ref34.payload;
-  state.hasH5SharePermission = payload;
+  state.showShareButton = payload;
 };
-export var setaAutoSubmitFlag = function setaAutoSubmitFlag(state, _ref35) {
+export var setH5SharePermission = function setH5SharePermission(state, _ref35) {
   var payload = _ref35.payload;
-  state.autoSubmitFlag = payload;
+  state.hasH5SharePermission = payload;
 };
 var reducerMap = {
   setNodeAssistantInfo: setNodeAssistantInfo,
@@ -601,10 +601,10 @@ var reducerMap = {
   setRejectLoading: setRejectLoading,
   setWithDrawLoading: setWithDrawLoading,
   setFollow: setFollow,
+  setaAutoSubmitFlag: setaAutoSubmitFlag,
   setPrivilege: setPrivilege,
   setShowShareButton: setShowShareButton,
-  setH5SharePermission: setH5SharePermission,
-  setaAutoSubmitFlag: setaAutoSubmitFlag
+  setH5SharePermission: setH5SharePermission
 };
 var reducers = function reducers() {
   var state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initState;

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

@@ -333,6 +333,12 @@ export var SUBMIT_COMPONENT_REISSUE_MAP = {
     goods: 'kmReissueGoods',
     shopCode: 'shopCode',
     systemOrderNo: 'kmSystemOrderNo'
+  },
+  JY_REISSUE_GOODS: {
+    type: 'jyReissueType',
+    goods: 'jyReissueGoods',
+    shopCode: 'shopCode',
+    systemOrderNo: 'jySystemOrderNo'
   }
 };
 export var SUBMIT_COMPONENT_RETURN_GOODS_MAP = {

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

@@ -570,7 +570,7 @@ var handleBsOrWdtReissueGoods = function handleBsOrWdtReissueGoods(_ref43) {
     if (item.workOrderComponentType !== 'GY_REISSUE_GOODS') {
       addContent(SUBMIT_COMPONENT_REISSUE_MAP[item.workOrderComponentType].shopCode, (reissue === null || reissue === void 0 ? void 0 : reissue.shopCode) || '');
     }
-    if (item.workOrderComponentType === 'WDT_REISSUE_GOODS' || item.workOrderComponentType === 'JST_REISSUE_GOODS' || item.workOrderComponentType === 'JST_RETURN_GOODS' || item.workOrderComponentType === 'GY_REISSUE_GOODS' || item.workOrderComponentType === 'KM_REISSUE_GOODS') {
+    if (item.workOrderComponentType === 'WDT_REISSUE_GOODS' || item.workOrderComponentType === 'JST_REISSUE_GOODS' || item.workOrderComponentType === 'JST_RETURN_GOODS' || item.workOrderComponentType === 'GY_REISSUE_GOODS' || item.workOrderComponentType === 'KM_REISSUE_GOODS' || item.workOrderComponentType === 'JY_REISSUE_GOODS') {
       addContent(SUBMIT_COMPONENT_REISSUE_MAP[item.workOrderComponentType].systemOrderNo, (reissue === null || reissue === void 0 ? void 0 : reissue[SUBMIT_COMPONENT_REISSUE_MAP[item.workOrderComponentType].systemOrderNo]) || '');
     }
     // 管易补发商品信息vipCode/shopCode未复现出丢失情况，兜底措施
@@ -1000,6 +1000,7 @@ var processComponent = function processComponent(_ref59) {
       case 'JST_REISSUE_GOODS':
       case 'JST_RETURN_GOODS':
       case 'KM_REISSUE_GOODS':
+      case 'JY_REISSUE_GOODS':
         wrapFn(handleBsOrWdtReissueGoods);
         break;
       case 'BS_RETURN_GOODS':

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

@@ -140,52 +140,54 @@ var getBasicsOrderInfo = function getBasicsOrderInfo(orderInfo, xiaozhiOrder) {
 //订单返填
 export var orderBack = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
-    var order_no, form, propsShopid, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, callbackShopId, setLoading, callKey, shopId, _res$data, res, shopInfo, _res$data3, _res$data4, _res$data5, JOIN_SHOP, hasFlagMap, _ref3, shopSourceStr, _ref3$thirdUserNick, thirdUserNick, thirdShopMainType, _kmVideoComponent$com, _data$value, _data$value3, _data$value4, _jstOrder$value, _jstOrder$value2, _bsOrder$value, _wlnOrder$value, _wdtOrder$value, _bsE3Order$value, _kmOrder$value, _gyOrder$value, _jyOrder$value, _skxOrder$value, _skxReturnOrder$value, _bsOrders$orders, _bsE3Orders$orderList, _wlnOrders$orders, _wdtOrders$trades, _gyOrders$trades, _jyOrders$trades, _kmOrders$orderDetail, promise, kmVideoComponent, OrderSubFormComponent, _yield$Promise$allSet, _yield$Promise$allSet2, data, xiaozhiOrder, jstOrder, bsOrder, wlnOrder, wdtOrder, bsE3Order, kmOrder, gyOrder, jyOrder, skxOrder, skxReturnOrder, kmVideoOrder, orderSubFormOrder, _data$value2, orderInfo, jstOrders, bsOrders, wlnOrders, wdtOrders, bsE3Orders, kmOrders, gyOrders, jyOrders, skxOrders, skxReturnOrders, bsInfo, wlnInfo, bsE3Info, wdtInfo, kmInfo, orderSubFormInfo, gyInfo, jyInfo, jstInfo, skxInfo, skxReturnInfo, formValue, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, hasSigningDatetime, _signDatetime$data, signDatetime, values, paymentUniqueKey;
+    var order_no, form, propsShopid, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, callbackShopId, setLoading, callKey, shopId, trySetShopId, _res$data, res, _res$data2, _res$data3, JOIN_SHOP, hasFlagMap, _ref3, shopSourceStr, _ref3$thirdUserNick, thirdUserNick, thirdShopMainType, _kmVideoComponent$com, _data$value, _data$value3, _data$value4, _jstOrder$value, _jstOrder$value2, _bsOrder$value, _wlnOrder$value, _wdtOrder$value, _bsE3Order$value, _kmOrder$value, _gyOrder$value, _jyOrder$value, _jyOrder$value$data, _skxOrder$value, _skxReturnOrder$value, _bsOrders$orders, _bsE3Orders$orderList, _wlnOrders$orders, _wdtOrders$trades, _gyOrders$trades, _jyOrders$trades, _kmOrders$orderDetail, promise, kmVideoComponent, OrderSubFormComponent, _yield$Promise$allSet, _yield$Promise$allSet2, data, xiaozhiOrder, jstOrder, bsOrder, wlnOrder, wdtOrder, bsE3Order, kmOrder, gyOrder, jyOrder, skxOrder, skxReturnOrder, kmVideoOrder, orderSubFormOrder, _data$value2, orderInfo, jstOrders, bsOrders, wlnOrders, wdtOrders, bsE3Orders, kmOrders, gyOrders, jyOrders, skxOrders, skxReturnOrders, bsInfo, wlnInfo, bsE3Info, wdtInfo, kmInfo, orderSubFormInfo, gyInfo, jyInfo, jstInfo, skxInfo, skxReturnInfo, formValue, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, hasSigningDatetime, _signDatetime$data, signDatetime, values, paymentUniqueKey;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           order_no = _ref.order_no, form = _ref.form, propsShopid = _ref.shopId, shopList = _ref.shopList, templateDetail = _ref.templateDetail, _ref$type = _ref.type, type = _ref$type === void 0 ? 'add' : _ref$type, callback = _ref.callback, fromQNCreateWorkOrderByOrderNo = _ref.fromQNCreateWorkOrderByOrderNo, _ref$plat = _ref.plat, plat = _ref$plat === void 0 ? {} : _ref$plat, callbackShopId = _ref.callbackShopId, setLoading = _ref.setLoading, callKey = _ref.callKey;
           console.log('orderBack-run--', callKey);
           shopId = propsShopid; //如果是pc平台且没有shopId的情况下 获取shopId
+          trySetShopId = function trySetShopId(theShopId, theShopName) {
+            var shopInfo = shopList.find(function (item) {
+              return item.shopId === theShopId;
+            });
+            if (!shopInfo) {
+              message.error("\u5339\u914D\u5E97\u94FA\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5\u662F\u5426\u6709".concat(theShopName, "\u5E97\u94FA\u6743\u9650"));
+            } else {
+              if (!shopInfo.auditStatus) {
+                message.error("\u5339\u914D\u5E97\u94FA\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5".concat(theShopName, "\u6388\u6743\u662F\u5426\u6B63\u5E38"));
+              } else {
+                shopId = theShopId;
+                callbackShopId === null || callbackShopId === void 0 ? void 0 : callbackShopId(shopId);
+              }
+            }
+          };
           if (!(order_no && [PlatForm.PC, PlatForm.WEB].includes(plat.platform) && !!(plat !== null && plat !== void 0 && plat.bindERP) && type === 'add')) {
-            _context.next = 18;
+            _context.next = 19;
             break;
           }
           setLoading === null || setLoading === void 0 ? void 0 : setLoading(true);
-          _context.prev = 5;
-          _context.next = 8;
+          _context.prev = 6;
+          _context.next = 9;
           return queryShopByTid({
             tid: order_no
           });
-        case 8:
+        case 9:
           res = _context.sent;
           if (res !== null && res !== void 0 && (_res$data = res.data) !== null && _res$data !== void 0 && _res$data.shopId) {
-            shopInfo = shopList.find(function (item) {
-              var _res$data2;
-              return item.shopId === (res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.shopId);
-            });
-            if (!shopInfo) {
-              message.error("\u5339\u914D\u5E97\u94FA\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5\u662F\u5426\u6709".concat(res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.shopName, "\u5E97\u94FA\u6743\u9650"));
-            } else {
-              if (!shopInfo.auditStatus) {
-                message.error("\u5339\u914D\u5E97\u94FA\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5".concat(res === null || res === void 0 ? void 0 : (_res$data4 = res.data) === null || _res$data4 === void 0 ? void 0 : _res$data4.shopName, "\u6388\u6743\u662F\u5426\u6B63\u5E38"));
-              } else {
-                shopId = res === null || res === void 0 ? void 0 : (_res$data5 = res.data) === null || _res$data5 === void 0 ? void 0 : _res$data5.shopId;
-                callbackShopId === null || callbackShopId === void 0 ? void 0 : callbackShopId(shopId);
-              }
-            }
+            trySetShopId(res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.shopId, res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.shopName);
           }
-          _context.next = 15;
+          _context.next = 16;
           break;
-        case 12:
-          _context.prev = 12;
-          _context.t0 = _context["catch"](5);
+        case 13:
+          _context.prev = 13;
+          _context.t0 = _context["catch"](6);
           console.error(_context.t0);
-        case 15:
-          _context.prev = 15;
+        case 16:
+          _context.prev = 16;
           setLoading === null || setLoading === void 0 ? void 0 : setLoading(false);
-          return _context.finish(15);
-        case 18:
+          return _context.finish(16);
+        case 19:
           //是否是对接平台，只有对接平台才能返填订单号
           JOIN_SHOP = shopList.find(function (item) {
             return !item.notJoin && item.shopId == shopId;
@@ -201,7 +203,7 @@ export var orderBack = /*#__PURE__*/function () {
           }).every(function (item) {
             return item === false;
           }))) {
-            _context.next = 23;
+            _context.next = 24;
             break;
           }
           //处理店铺映射存在店铺信息却没有返填的问题
@@ -211,12 +213,12 @@ export var orderBack = /*#__PURE__*/function () {
             });
           }
           return _context.abrupt("return");
-        case 23:
+        case 24:
           _ref3 = shopList.find(function (item) {
             return item.shopId == shopId;
           }) || {}, shopSourceStr = _ref3.shopSourceStr, _ref3$thirdUserNick = _ref3.thirdUserNick, thirdUserNick = _ref3$thirdUserNick === void 0 ? '' : _ref3$thirdUserNick, thirdShopMainType = _ref3.thirdShopMainType;
           setLoading === null || setLoading === void 0 ? void 0 : setLoading(true);
-          _context.prev = 25;
+          _context.prev = 26;
           promise = [];
           if (!JOIN_SHOP || thirdShopMainType === '1' && shopSourceStr === 'JD') {
             promise.push(Promise.resolve([]));
@@ -233,7 +235,7 @@ export var orderBack = /*#__PURE__*/function () {
           // 京东自营订单数据获取
           promise.push(
           // thirdShopSubType === 1 && shopSourceStr === 'JD' && window.invokerSDK
-          shopSourceStr === 'JD' && window.invokerSDK ? xzSDK.getActiveUserTardeInfo(order_no) : Promise.resolve([]));
+          shopSourceStr === 'JD' && window.invokerSDK ? xzSDK.getActiveUserTardeInfo(order_no) : Promise.reject());
           Object.keys(hasFlagMap).forEach(function (key) {
             var _hasFlagMap$key = hasFlagMap[key],
               flag = _hasFlagMap$key.flag,
@@ -273,9 +275,9 @@ export var orderBack = /*#__PURE__*/function () {
           }
 
           //需按照orderBackMap中的顺序结构
-          _context.next = 36;
+          _context.next = 37;
           return Promise.allSettled(promise);
-        case 36:
+        case 37:
           _yield$Promise$allSet = _context.sent;
           _yield$Promise$allSet2 = _slicedToArray(_yield$Promise$allSet, 14);
           data = _yield$Promise$allSet2[0];
@@ -326,7 +328,7 @@ export var orderBack = /*#__PURE__*/function () {
           bsE3Orders = bsE3Order === null || bsE3Order === void 0 ? void 0 : (_bsE3Order$value = bsE3Order.value) === null || _bsE3Order$value === void 0 ? void 0 : _bsE3Order$value.data;
           kmOrders = kmOrder === null || kmOrder === void 0 ? void 0 : (_kmOrder$value = kmOrder.value) === null || _kmOrder$value === void 0 ? void 0 : _kmOrder$value.data;
           gyOrders = gyOrder === null || gyOrder === void 0 ? void 0 : (_gyOrder$value = gyOrder.value) === null || _gyOrder$value === void 0 ? void 0 : _gyOrder$value.data;
-          jyOrders = jyOrder === null || jyOrder === void 0 ? void 0 : (_jyOrder$value = jyOrder.value) === null || _jyOrder$value === void 0 ? void 0 : _jyOrder$value.data;
+          jyOrders = jyOrder === null || jyOrder === void 0 ? void 0 : (_jyOrder$value = jyOrder.value) === null || _jyOrder$value === void 0 ? void 0 : (_jyOrder$value$data = _jyOrder$value.data) === null || _jyOrder$value$data === void 0 ? void 0 : _jyOrder$value$data.tradeOrderDetails;
           skxOrders = skxOrder === null || skxOrder === void 0 ? void 0 : (_skxOrder$value = skxOrder.value) === null || _skxOrder$value === void 0 ? void 0 : _skxOrder$value.data;
           skxReturnOrders = skxReturnOrder === null || skxReturnOrder === void 0 ? void 0 : (_skxReturnOrder$value = skxReturnOrder.value) === null || _skxReturnOrder$value === void 0 ? void 0 : _skxReturnOrder$value.data;
           console.log('skxOrders', {
@@ -553,7 +555,7 @@ export var orderBack = /*#__PURE__*/function () {
           pushGyLog('detail', detail);
           //抖音数据特殊处理
           if (!orderInfo) {
-            _context.next = 137;
+            _context.next = 138;
             break;
           }
           if (shopSourceStr === 'FXG') {
@@ -565,7 +567,7 @@ export var orderBack = /*#__PURE__*/function () {
           hasSelectItem = HasErpItemSelectHandle(templateDetail);
           erpPromiseList = [];
           if (!(shopSourceStr === 'TAOBAO' && hasSelectItem)) {
-            _context.next = 121;
+            _context.next = 122;
             break;
           }
           list = detail['itemList'];
@@ -583,10 +585,10 @@ export var orderBack = /*#__PURE__*/function () {
               resolve({});
             });
           });
-          _context.prev = 111;
-          _context.next = 114;
+          _context.prev = 112;
+          _context.next = 115;
           return Promise.all(promises);
-        case 114:
+        case 115:
           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), {}, {
@@ -596,25 +598,25 @@ export var orderBack = /*#__PURE__*/function () {
               })
             });
           });
-          _context.next = 121;
+          _context.next = 122;
           break;
-        case 118:
-          _context.prev = 118;
-          _context.t1 = _context["catch"](111);
+        case 119:
+          _context.prev = 119;
+          _context.t1 = _context["catch"](112);
           console.error('调用erp获取宝贝编码错误', _context.t1);
-        case 121:
+        case 122:
           // 判断是否存在签收时间组件
           hasSigningDatetime = HasTradeSigningDatetime(templateDetail); // 如存在签收时间组件且订单也有返回相应物流单号跟物流公司编码，则调用接口获取签收时间
           if (!hasSigningDatetime) {
-            _context.next = 137;
+            _context.next = 138;
             break;
           }
           if (!(orderInfo !== null && orderInfo !== void 0 && orderInfo.expressLogisticsCompany && orderInfo !== null && orderInfo !== void 0 && orderInfo.expressLogisticsCode)) {
-            _context.next = 136;
+            _context.next = 137;
             break;
           }
-          _context.prev = 124;
-          _context.next = 127;
+          _context.prev = 125;
+          _context.next = 128;
           return request({
             url: '/qy/logistics/logisticsSignTime',
             method: 'post',
@@ -624,21 +626,21 @@ export var orderBack = /*#__PURE__*/function () {
               mailNo: orderInfo.expressLogisticsCode
             }
           });
-        case 127:
+        case 128:
           signDatetime = _context.sent;
           detail['tradeSigningDateTime'] = signDatetime === null || signDatetime === void 0 ? void 0 : (_signDatetime$data = signDatetime.data) === null || _signDatetime$data === void 0 ? void 0 : _signDatetime$data.signTime;
-          _context.next = 134;
+          _context.next = 135;
           break;
-        case 131:
-          _context.prev = 131;
-          _context.t2 = _context["catch"](124);
+        case 132:
+          _context.prev = 132;
+          _context.t2 = _context["catch"](125);
           console.error('调用签收时间错误', _context.t2);
-        case 134:
-          _context.next = 137;
+        case 135:
+          _context.next = 138;
           break;
-        case 136:
-          detail['tradeSigningDateTime'] = '';
         case 137:
+          detail['tradeSigningDateTime'] = '';
+        case 138:
           values = orderBackFormValues({
             detail: detail,
             _get_order_fail_: !orderInfo,
@@ -674,6 +676,11 @@ export var orderBack = /*#__PURE__*/function () {
             }
           }
           // console.log('orderback', values);
+          if (values.shopId) {
+            trySetShopId(values.shopId, values.shopName);
+            delete values.shopId;
+            delete values.shopName;
+          }
           form.setFieldsValue(_objectSpread(_objectSpread(_objectSpread({}, formValue), values), {}, {
             fixed_field_buyerOpenUid: orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.buyerOpenUid,
             shopId: shopId
@@ -683,21 +690,21 @@ export var orderBack = /*#__PURE__*/function () {
             shopId: shopId
           }));
           callback === null || callback === void 0 ? void 0 : callback(detail, templateDetail);
-          _context.next = 148;
+          _context.next = 150;
           break;
-        case 145:
-          _context.prev = 145;
-          _context.t3 = _context["catch"](25);
+        case 147:
+          _context.prev = 147;
+          _context.t3 = _context["catch"](26);
           console.error(_context.t3);
-        case 148:
-          _context.prev = 148;
+        case 150:
+          _context.prev = 150;
           setLoading === null || setLoading === void 0 ? void 0 : setLoading(false);
-          return _context.finish(148);
-        case 151:
+          return _context.finish(150);
+        case 153:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[5, 12, 15, 18], [25, 145, 148, 151], [111, 118], [124, 131]]);
+    }, _callee, null, [[6, 13, 16, 19], [26, 147, 150, 153], [112, 119], [125, 132]]);
   }));
   return function orderBack(_x) {
     return _ref2.apply(this, arguments);
@@ -1031,6 +1038,7 @@ export var reversalFormValues = function reversalFormValues() {
       case 'JST_REISSUE_GOODS':
       case 'JST_RETURN_GOODS':
       case 'KM_REISSUE_GOODS':
+      case 'JY_REISSUE_GOODS':
         prv["".concat(next.uniqueKey, "_shopCode")] = values[next.uniqueKey]['shopCode'];
         break;
       case 'BS_DELIVERY_NO':

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

@@ -82,7 +82,7 @@ export var orderBackMap = function orderBackMap(_ref) {
       flag: HasFilterHandle(templateDetail, orderBackKeyListMap.hasJy),
       promiseRequest: function promiseRequest() {
         return jyOrderDetail({
-          tid: order_no
+          billNo: order_no
         });
       }
     },

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

@@ -1005,6 +1005,28 @@ var processKmReissueGoods = function processKmReissueGoods(templateColumns) {
     };
   };
 };
+var processJyReissueGoods = function processJyReissueGoods(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, {
+        jySystemOrder: {
+          orderNo: orderNo
+        },
+        jyReissueType: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_jyReissueType")), !isNull(config === null || config === void 0 ? void 0 : config.initReason) ? [config.initReason] : ['1']),
+        jyReissueGoods: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_jyReissueGoods")), []),
+        shopCode: getValue("".concat(nex.uniqueKey, "_shopCode")),
+        jySystemOrderNo: getValue("".concat(nex.uniqueKey, "_jySystemOrderNo"))
+      });
+    };
+  };
+};
 var processGyReissueGoods = function processGyReissueGoods(templateColumns) {
   return function (getValue) {
     return function (nex, config) {
@@ -1098,14 +1120,14 @@ var processJstReturnGoods = function processJstReturnGoods(templateColumns) {
 };
 var processLabel = function processLabel(getValue) {
   return function (nex, config) {
-    var _ref76;
-    return _ref76 = {}, _defineProperty(_ref76, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _defineProperty(_ref76, "".concat(nex.uniqueKey, "_label"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _ref76;
+    var _ref77;
+    return _ref77 = {}, _defineProperty(_ref77, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _defineProperty(_ref77, "".concat(nex.uniqueKey, "_label"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _ref77;
   };
 };
 var processMemberLevel = function processMemberLevel(getValue) {
   return function (nex, config) {
-    var _ref77;
-    return _ref77 = {}, _defineProperty(_ref77, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _defineProperty(_ref77, "".concat(nex.uniqueKey, "_memberLevel"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _ref77;
+    var _ref78;
+    return _ref78 = {}, _defineProperty(_ref78, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _defineProperty(_ref78, "".concat(nex.uniqueKey, "_memberLevel"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _ref78;
   };
 };
 var processAfterSalesOrderId = function processAfterSalesOrderId(getValue) {
@@ -1231,6 +1253,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
       JY_GOODS: processJyGoods(templateColumns),
       KM_GOODS: processKmGoods(templateColumns),
       KM_REISSUE_GOODS: processKmReissueGoods(templateColumns),
+      JY_REISSUE_GOODS: processJyReissueGoods(templateColumns),
       JST_GOODS: processJstGoods(templateColumns),
       BS_REISSUE_GOODS: processBsReissueGoods,
       BS_EXCHANGE_GOODS: processBsExchangeGoods,

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

@@ -77,10 +77,10 @@ export interface FlowTemplateDetailState {
     rejectLoading: boolean;
     withdrawLoading: boolean;
     follow: boolean;
+    autoSubmitFlag: boolean;
     privilege: string;
     showShareButton: boolean;
     hasH5SharePermission: boolean;
-    autoSubmitFlag: boolean;
 }
 export interface QyFlowPanelInfoRequest {
     /**

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

@@ -638,7 +638,7 @@ export var nodeWorkOrderPending = function nodeWorkOrderPending(data) {
 };
 export var jyOrderDetail = function jyOrderDetail(data) {
   return request({
-    url: '/qy/gdfw/oms/jyOrderDetail',
+    url: '/qy/gdfw/order/jyOrderDetail',
     method: 'post',
     data: data,
     infoLevel: 'warning'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
-  "version": "2.2.13-beta.3",
+  "version": "2.2.13-beta.31",
   "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": "2.2.13-beta.3",
-    "@kmkf-fe-packages/kmkf-utils": "2.2.13-beta.3",
-    "@kmkf-fe-packages/services-components": "2.2.13-beta.3",
+    "@kmkf-fe-packages/basic-components": "2.2.13-beta.31",
+    "@kmkf-fe-packages/kmkf-utils": "2.2.13-beta.31",
+    "@kmkf-fe-packages/services-components": "2.2.13-beta.31",
     "@reduxjs/toolkit": "^1.8.5",
     "ahooks": "^3.7.4",
     "copy-to-clipboard": "^3.3.3",
@@ -74,7 +74,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f6e15008ac1484435d84ed89424fc28a68d7e899",
+  "gitHead": "95ce877aed30ef604316f40df926437dfc42d7a9",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }