@kmkf-fe-packages/kmkf-work-order-service-component 2.0.12-beta.2 → 2.0.12-beta.21

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

@@ -1,6 +1,7 @@
 import React from 'react';
+import { FormInstance } from 'antd';
 declare type CloseModalType = {
-    handleClose: (p: any) => void;
+    handleClose: (p: any, form: FormInstance<any>) => void;
 };
 declare const CloseModal: ({ handleClose }: CloseModalType) => React.JSX.Element;
 export default CloseModal;

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

@@ -9,7 +9,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, { useRef, useContext } from 'react';
-import { Modal, Form, Input, message } from 'antd';
+import { Modal, Form, Input, message, Radio } from 'antd';
 import { ApaasUploadAsync } from '@kmkf-fe-packages/basic-components';
 import { selectCurrentAction } from "../../store/selector";
 import { useSelector } from "../../context/useSelector";
@@ -28,8 +28,9 @@ var CloseModal = function CloseModal(_ref) {
     dispatch({
       type: 'setAction'
     });
-    form.resetFields();
+    // form.resetFields();
   };
+
   var onOK = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _imageRef$current;
@@ -47,8 +48,11 @@ var CloseModal = function CloseModal(_ref) {
             return form.validateFields();
           case 4:
             remark = _context.sent;
-            handleClose(remark);
-            form.resetFields();
+            if (!(remark !== null && remark !== void 0 && remark.flowRefuseType)) {
+              remark.flowRefuseType = 1;
+            }
+            handleClose(remark, form);
+            // form.resetFields();
           case 7:
           case "end":
             return _context.stop();
@@ -64,14 +68,24 @@ var CloseModal = function CloseModal(_ref) {
     visible: action === 'close',
     onCancel: closeModal,
     onOk: onOK
-  }, /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-    style: {
-      marginBottom: '16px'
-    }
-  }, "\u786E\u5B9A\u8981\u5173\u95ED\u8BE5\u6761\u5DE5\u5355\u5417\uFF1F"), /*#__PURE__*/React.createElement(Form, {
+  }, /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Form, {
     form: form,
-    layout: "vertical"
+    layout: "vertical",
+    initialValues: {
+      flowRefuseType: 1
+    }
   }, /*#__PURE__*/React.createElement(Form.Item, {
+    name: "flowRefuseType",
+    label: "\u8BF7\u9009\u62E9\u5DE5\u5355\u5173\u95ED\u65B9\u5F0F?",
+    rules: [{
+      required: true,
+      message: "\u8BF7\u9009\u62E9\u5DE5\u5355\u5173\u95ED\u65B9\u5F0F"
+    }]
+  }, /*#__PURE__*/React.createElement(Radio.Group, null, /*#__PURE__*/React.createElement(Radio, {
+    value: 1
+  }, "\u5C06\u5F53\u524D\u8282\u70B9\u5DE5\u5355\u72B6\u6001\u548C\u6D41\u7A0B\u72B6\u6001\u53D8\u4E3A\u5DF2\u5173\u95ED"), /*#__PURE__*/React.createElement(Radio, {
+    value: 2
+  }, "\u5C06\u5DF2\u6D41\u8F6C\u7684\u6240\u6709\u4EBA\u5DE5\u8282\u70B9\u5DE5\u5355\u72B6\u6001\u548C\u6D41\u7A0B\u72B6\u6001\u53D8\u4E3A\u5DF2\u5173\u95ED"))), /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u5907\u6CE8",
     name: "remark",
     rules: [{

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

@@ -117,6 +117,10 @@ var FormRender = function FormRender(props, ref) {
     _useState10 = _slicedToArray(_useState9, 2),
     shopId = _useState10[0],
     setShopId = _useState10[1];
+  var _useState11 = useState(false),
+    _useState12 = _slicedToArray(_useState11, 2),
+    isOrderBackShopId = _useState12[0],
+    setIsOrderBackShopId = _useState12[1];
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     preNodeForm = _Form$useForm2[0];
@@ -351,6 +355,10 @@ var FormRender = function FormRender(props, ref) {
       orderNo = _ref2.orderNo,
       buyerId = _ref2.buyerId,
       buyerNick = _ref2.buyerNick;
+    if (isOrderBackShopId) {
+      setIsOrderBackShopId(false);
+      return;
+    }
     form.resetFields();
     //获取一些默认数据
     var jsonMap = templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList.reduce(function (prv, next) {
@@ -689,7 +697,13 @@ var FormRender = function FormRender(props, ref) {
       type: workOrderId ? 'edit' : 'add',
       callback: orderBackReplace,
       fromQNCreateWorkOrderByOrderNo: false,
-      plat: plat
+      plat: plat,
+      callbackShopId: function callbackShopId(id) {
+        setIsOrderBackShopId(true);
+        setTimeout(function () {
+          setShopId(id);
+        }, 0);
+      }
     });
   };
   // 组件值变化
@@ -893,7 +907,7 @@ var FormRender = function FormRender(props, ref) {
           templateDetail: templateDetail,
           callback: orderBackReplace,
           fromQNCreateWorkOrderByOrderNo: false,
-          systemOrderId: plat.subOrderNo
+          plat: plat
         });
       }
     }

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

@@ -32,6 +32,7 @@ var Record = function Record(props) {
     workOrderUpdateLog = props.workOrderUpdateLog,
     componentDtoList = props.componentDtoList,
     imgList = props.imgList;
+  var contextLines = context === null || context === void 0 ? void 0 : context.split('\n');
   return /*#__PURE__*/React.createElement("div", {
     className: styles.remarkContext
   }, /*#__PURE__*/React.createElement("div", {
@@ -47,7 +48,11 @@ var Record = function Record(props) {
     }
   }, getFlowOperate === null || getFlowOperate === void 0 ? void 0 : getFlowOperate[operatorType]))), /*#__PURE__*/React.createElement("div", null, "\u8282\u70B9\uFF1A", nodeName), /*#__PURE__*/React.createElement("div", {
     className: styles.context
-  }, /*#__PURE__*/React.createElement("div", null, context), /*#__PURE__*/React.createElement("div", null, imgList === null || imgList === void 0 ? void 0 : imgList.map(function (item) {
+  }, /*#__PURE__*/React.createElement("div", null, contextLines === null || contextLines === void 0 ? void 0 : contextLines.map(function (item, index) {
+    return /*#__PURE__*/React.createElement("span", {
+      key: index
+    }, item, /*#__PURE__*/React.createElement("br", null));
+  })), /*#__PURE__*/React.createElement("div", null, imgList === null || imgList === void 0 ? void 0 : imgList.map(function (item) {
     return /*#__PURE__*/React.createElement(Image, {
       width: 40,
       height: 40,

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

@@ -4,6 +4,7 @@ import { imgResize } from '@kmkf-fe-packages/kmkf-utils';
 import { getFlowOperate } from "../../common";
 import styles from "./index.module.less";
 var RemarkShow = function RemarkShow(props) {
+  var _context$split;
   var time = props.time,
     operator = props.operator,
     context = props.context,
@@ -34,7 +35,11 @@ var RemarkShow = function RemarkShow(props) {
     onClick: handleOpenRemarkList
   }, "\u8BB0\u5F55"))), /*#__PURE__*/React.createElement("div", {
     className: styles.context
-  }, /*#__PURE__*/React.createElement("span", null, context), /*#__PURE__*/React.createElement(React.Fragment, null, imgList === null || imgList === void 0 ? void 0 : imgList.map(function (item) {
+  }, /*#__PURE__*/React.createElement("div", null, context === null || context === void 0 ? void 0 : (_context$split = context.split('\n')) === null || _context$split === void 0 ? void 0 : _context$split.map(function (item, index) {
+    return /*#__PURE__*/React.createElement("span", {
+      key: index
+    }, item, /*#__PURE__*/React.createElement("br", null));
+  })), /*#__PURE__*/React.createElement(React.Fragment, null, imgList === null || imgList === void 0 ? void 0 : imgList.map(function (item) {
     return /*#__PURE__*/React.createElement(Image, {
       width: 20,
       height: 20,

package/dist/esm/FlowTemplateDetailV2/index.js

@@ -684,7 +684,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
   }();
   // 关闭工单
   var handleClose = /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(formData) {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(formData, form) {
       var _currentNodeDetail$wo12, _currentNodeDetail$no5, _currentNodeDetail$wo13, _res$data8, _res$data8$failList, res, _res$data9, _res$data9$failList, _res$data9$failList$;
       return _regeneratorRuntime().wrap(function _callee7$(_context7) {
         while (1) switch (_context7.prev = _context7.next) {
@@ -714,19 +714,20 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
             } else {
               message.error((_res$data9 = res.data) === null || _res$data9 === void 0 ? void 0 : (_res$data9$failList = _res$data9.failList) === null || _res$data9$failList === void 0 ? void 0 : (_res$data9$failList$ = _res$data9$failList[0]) === null || _res$data9$failList$ === void 0 ? void 0 : _res$data9$failList$.failReason);
             }
-            _context7.next = 10;
+            form.resetFields();
+            _context7.next = 11;
             break;
-          case 7:
-            _context7.prev = 7;
+          case 8:
+            _context7.prev = 8;
             _context7.t0 = _context7["catch"](0);
             console.log('关闭工单失败', _context7.t0);
-          case 10:
+          case 11:
           case "end":
             return _context7.stop();
         }
-      }, _callee7, null, [[0, 7]]);
+      }, _callee7, null, [[0, 8]]);
     }));
-    return function handleClose(_x4) {
+    return function handleClose(_x4, _x5) {
       return _ref7.apply(this, arguments);
     };
   }();
@@ -773,7 +774,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
         }
       }, _callee8, null, [[0, 7]]);
     }));
-    return function handleForWard(_x5) {
+    return function handleForWard(_x6) {
       return _ref8.apply(this, arguments);
     };
   }();
@@ -807,7 +808,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
               });
             };
             handleTimeOut = function handleTimeOut() {
-              message.error("接口响应超时");
+              message.error('接口响应超时');
               dispatch({
                 type: 'setRejectLoading',
                 payload: false
@@ -863,7 +864,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
         }
       }, _callee9, null, [[3, 13]]);
     }));
-    return function handleReturnWorkOrder(_x6) {
+    return function handleReturnWorkOrder(_x7) {
       return _ref9.apply(this, arguments);
     };
   }();
@@ -896,7 +897,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
               });
             };
             handleTimeOut = function handleTimeOut() {
-              message.error("接口响应超时");
+              message.error('接口响应超时');
               dispatch({
                 type: 'setWithDrawLoading',
                 payload: false
@@ -953,7 +954,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
         }
       }, _callee10, null, [[3, 13]]);
     }));
-    return function handleWithdraw(_x7) {
+    return function handleWithdraw(_x8) {
       return _ref10.apply(this, arguments);
     };
   }();
@@ -1034,7 +1035,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
         }
       }, _callee11, null, [[0, 12, 15, 18]]);
     }));
-    return function handleReminder(_x8) {
+    return function handleReminder(_x9) {
       return _ref11.apply(this, arguments);
     };
   }();

package/dist/esm/WorkOrder/components/WorkOrderList/index.js

@@ -156,6 +156,9 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref4) {
   var companyKey = useAppSelector(function (state) {
     return state.workOrder.userInfo.companyKey;
   });
+  var bindERP = useAppSelector(function (state) {
+    return state.workOrder.userInfo.bindERP;
+  });
   var platformInfo = useAppSelector(function (state) {
     return state.global.platformInfo;
   });
@@ -533,7 +536,8 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref4) {
       platform: platform,
       shopId: shopId,
       userKey: userKey,
-      companyKey: companyKey
+      companyKey: companyKey,
+      bindERP: bindERP
     },
     callbackDealWorkOrderSuccess: onDealWorkOrderSuccess,
     onOpenWangWang: onOpenWangWang

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

@@ -183,6 +183,11 @@ export var SUBMIT_COMPONENT_ERP_LOGISTICS_MAP = {
     list: 'kmLogisticsList',
     company: 'kmLogisticsCompany',
     code: 'kmLogisticsCode'
+  },
+  JST_LOGISTICS: {
+    list: 'jstItemList',
+    company: 'logisticsCompany',
+    code: 'logisticsCode'
   }
 };
 export var SUBMIT_COMPONENT_SEND_GOOD_MAP = {
@@ -247,7 +252,8 @@ export var SUBMIT_COMPONENT_REISSUE_MAP = {
     type: 'jstReissueType',
     goods: 'jstReissueGoods',
     shopCode: 'shopCode',
-    systemOrderNo: 'jstSystemOrderNo'
+    systemOrderNo: 'jstSystemOrderNo',
+    systemOrderBillType: 'jstSystemOrderBillType'
   }
 };
 export var SUBMIT_COMPONENT_RETURN_GOODS_MAP = {

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

@@ -17,6 +17,7 @@ import { findLabelBySelectValue } from '@kmkf-fe-packages/kmkf-utils';
 import { findValueByField } from "./tools";
 import { DEFAULT_STRING_COMPONENT_TYPE_FIELD_MAPPING, DEFAULT_ARRAY_COMPONENT_TYPE_FIELD_MAPPING, SUBMIT_COMPONENT_STATUS_MAP, SUBMIT_COMPONENT_GOOD_STATUS_MAP, SUBMIT_COMPONENT_ERP_LOGISTICS_MAP, SUBMIT_COMPONENT_SEND_GOOD_MAP, SUBMIT_COMPONENT_GOODS_MAP, SUBMIT_COMPONENT_REISSUE_MAP, SUBMIT_COMPONENT_RETURN_GOODS_MAP, SUBMIT_COMPONENT_SYSTEM_ORDER_MAP } from "./constant";
 import cache from "../cache";
+import Monitor from 'kmkf-monitor';
 var handleTradeIdInput = function handleTradeIdInput(_ref) {
   var addContent = _ref.addContent,
     upgradeParams = _ref.upgradeParams,
@@ -272,23 +273,9 @@ var handleEnterprisePayment = function handleEnterprisePayment(_ref22) {
     upgradeParams('buyerOpenUid', getNowData("".concat(item.uniqueKey, ".enterprisePaymentBuyerOpenUid"), ''));
   };
 };
-var handleJstLogistics = function handleJstLogistics(_ref23) {
+var handleJstSupply = function handleJstSupply(_ref23) {
   var addContent = _ref23.addContent,
     getNowData = _ref23.getNowData;
-  return function (item) {
-    var logisticsList = getNowData(item.uniqueKey, []);
-    addContent('jstItemList', logisticsList);
-    addContent('logisticsCompany', logisticsList.map(function (item) {
-      return item.logisticsCompany;
-    }).join());
-    addContent('logisticsCode', logisticsList.map(function (item) {
-      return item.logisticsCode;
-    }).join());
-  };
-};
-var handleJstSupply = function handleJstSupply(_ref24) {
-  var addContent = _ref24.addContent,
-    getNowData = _ref24.getNowData;
   return function (item) {
     var supplyList = getNowData(item.uniqueKey, []);
     addContent('jstItemList', supplyList);
@@ -300,9 +287,9 @@ var handleJstSupply = function handleJstSupply(_ref24) {
     }).join());
   };
 };
-var handleJstSendGood = function handleJstSendGood(_ref25) {
-  var addContent = _ref25.addContent,
-    getNowData = _ref25.getNowData;
+var handleJstSendGood = function handleJstSendGood(_ref24) {
+  var addContent = _ref24.addContent,
+    getNowData = _ref24.getNowData;
   return function (item) {
     var sendList = getNowData(item.uniqueKey, []);
     addContent('jstItemList', sendList);
@@ -314,9 +301,9 @@ var handleJstSendGood = function handleJstSendGood(_ref25) {
     }).join());
   };
 };
-var handleJstItemSelectThird = function handleJstItemSelectThird(_ref26) {
-  var addContent = _ref26.addContent,
-    getNowData = _ref26.getNowData;
+var handleJstItemSelectThird = function handleJstItemSelectThird(_ref25) {
+  var addContent = _ref25.addContent,
+    getNowData = _ref25.getNowData;
   return function (item) {
     var list = getNowData(item.uniqueKey, []);
     addContent('jstItemList', list);
@@ -328,9 +315,9 @@ var handleJstItemSelectThird = function handleJstItemSelectThird(_ref26) {
     }).join());
   };
 };
-var handleReissueLogistics = function handleReissueLogistics(_ref27) {
-  var addContent = _ref27.addContent,
-    getNowData = _ref27.getNowData;
+var handleReissueLogistics = function handleReissueLogistics(_ref26) {
+  var addContent = _ref26.addContent,
+    getNowData = _ref26.getNowData;
   return function (item) {
     var list = getNowData(item.uniqueKey, []);
     addContent('reissueLogisticsList', list);
@@ -342,9 +329,9 @@ var handleReissueLogistics = function handleReissueLogistics(_ref27) {
     }).join());
   };
 };
-var handleErpLogistics = function handleErpLogistics(_ref28) {
-  var addContent = _ref28.addContent,
-    getNowData = _ref28.getNowData;
+var handleErpLogistics = function handleErpLogistics(_ref27) {
+  var addContent = _ref27.addContent,
+    getNowData = _ref27.getNowData;
   return function (item) {
     var logisticsList = getNowData(item.uniqueKey, []);
     addContent(SUBMIT_COMPONENT_ERP_LOGISTICS_MAP[item.workOrderComponentType].list, logisticsList);
@@ -360,9 +347,9 @@ var handleErpLogistics = function handleErpLogistics(_ref28) {
     }));
   };
 };
-var handleErpSendGood = function handleErpSendGood(_ref29) {
-  var addContent = _ref29.addContent,
-    getNowData = _ref29.getNowData;
+var handleErpSendGood = function handleErpSendGood(_ref28) {
+  var addContent = _ref28.addContent,
+    getNowData = _ref28.getNowData;
   return function (item) {
     var sendList = getNowData(item.uniqueKey, []);
     addContent(SUBMIT_COMPONENT_SEND_GOOD_MAP[item.workOrderComponentType].list, sendList);
@@ -378,9 +365,9 @@ var handleErpSendGood = function handleErpSendGood(_ref29) {
     }));
   };
 };
-var handleWdtSendGood = function handleWdtSendGood(_ref30) {
-  var addContent = _ref30.addContent,
-    getNowData = _ref30.getNowData;
+var handleWdtSendGood = function handleWdtSendGood(_ref29) {
+  var addContent = _ref29.addContent,
+    getNowData = _ref29.getNowData;
   return function (item) {
     var sendList = getNowData(item.uniqueKey, []);
     addContent('wdtSendGood', sendList);
@@ -401,9 +388,9 @@ var handleWdtSendGood = function handleWdtSendGood(_ref30) {
     }));
   };
 };
-var handleGySendGood = function handleGySendGood(_ref31) {
-  var addContent = _ref31.addContent,
-    getNowData = _ref31.getNowData;
+var handleGySendGood = function handleGySendGood(_ref30) {
+  var addContent = _ref30.addContent,
+    getNowData = _ref30.getNowData;
   return function (item) {
     var sendList = getNowData(item.uniqueKey, []);
     addContent('gySendGood', sendList);
@@ -419,18 +406,18 @@ var handleGySendGood = function handleGySendGood(_ref31) {
     }));
   };
 };
-var handleLogisticsTrajectory = function handleLogisticsTrajectory(_ref32) {
-  var addContent = _ref32.addContent,
-    getNowData = _ref32.getNowData;
+var handleLogisticsTrajectory = function handleLogisticsTrajectory(_ref31) {
+  var addContent = _ref31.addContent,
+    getNowData = _ref31.getNowData;
   return function (item) {
     ['trajectoryCompany', 'trajectoryCode', 'trajectorySnapshot', 'trajectoryPhone'].map(function (key) {
       addContent(key, getNowData("".concat(item.uniqueKey, ".").concat(key), ''));
     });
   };
 };
-var handleLogisticsTrajectoryMore = function handleLogisticsTrajectoryMore(_ref33) {
-  var addContent = _ref33.addContent,
-    getNowData = _ref33.getNowData;
+var handleLogisticsTrajectoryMore = function handleLogisticsTrajectoryMore(_ref32) {
+  var addContent = _ref32.addContent,
+    getNowData = _ref32.getNowData;
   return function (item) {
     var trajectoryList = getNowData(item.uniqueKey, []);
     addContent('trajectoryList', trajectoryList);
@@ -445,18 +432,18 @@ var handleLogisticsTrajectoryMore = function handleLogisticsTrajectoryMore(_ref3
     }));
   };
 };
-var handleErpGoods = function handleErpGoods(_ref34) {
-  var addContent = _ref34.addContent,
-    getNowData = _ref34.getNowData;
+var handleErpGoods = function handleErpGoods(_ref33) {
+  var addContent = _ref33.addContent,
+    getNowData = _ref33.getNowData;
   return function (item) {
     var goods = getNowData(item.uniqueKey, {});
     addContent(SUBMIT_COMPONENT_GOODS_MAP[item.workOrderComponentType].type, goods === null || goods === void 0 ? void 0 : goods[SUBMIT_COMPONENT_GOODS_MAP[item.workOrderComponentType].type]);
     addContent(SUBMIT_COMPONENT_GOODS_MAP[item.workOrderComponentType].shopCode, (goods === null || goods === void 0 ? void 0 : goods[SUBMIT_COMPONENT_GOODS_MAP[item.workOrderComponentType].shopCode]) || '');
   };
 };
-var handleBsExchangeGoods = function handleBsExchangeGoods(_ref35) {
-  var addContent = _ref35.addContent,
-    getNowData = _ref35.getNowData;
+var handleBsExchangeGoods = function handleBsExchangeGoods(_ref34) {
+  var addContent = _ref34.addContent,
+    getNowData = _ref34.getNowData;
   return function (item) {
     var _bsExchange$bsExchang;
     var bsExchange = getNowData(item.uniqueKey, {});
@@ -481,34 +468,74 @@ var handleBsExchangeGoods = function handleBsExchangeGoods(_ref35) {
     }
   };
 };
-var handleWdtExchangeGoods = function handleWdtExchangeGoods(_ref36) {
-  var addContent = _ref36.addContent,
-    getNowData = _ref36.getNowData;
+var handleWdtExchangeGoods = function handleWdtExchangeGoods(_ref35) {
+  var addContent = _ref35.addContent,
+    getNowData = _ref35.getNowData;
   return function (item) {
     var wdtExchange = getNowData(item.uniqueKey, {});
     addContent('wdtExchangeGoods', wdtExchange === null || wdtExchange === void 0 ? void 0 : wdtExchange.wdtExchangeGoods);
     addContent('shopCode', (wdtExchange === null || wdtExchange === void 0 ? void 0 : wdtExchange.shopCode) || '');
   };
 };
-var handleBsOrWdtReissueGoods = function handleBsOrWdtReissueGoods(_ref37) {
-  var addContent = _ref37.addContent,
-    getNowData = _ref37.getNowData;
+var handleBsOrWdtReissueGoods = function handleBsOrWdtReissueGoods(_ref36) {
+  var addContent = _ref36.addContent,
+    getNowData = _ref36.getNowData;
   return function (item) {
     var reissue = getNowData(item.uniqueKey, {});
     addContent(SUBMIT_COMPONENT_REISSUE_MAP[item.workOrderComponentType].type, reissue === null || reissue === void 0 ? void 0 : reissue[SUBMIT_COMPONENT_REISSUE_MAP[item.workOrderComponentType].type]);
     addContent(SUBMIT_COMPONENT_REISSUE_MAP[item.workOrderComponentType].goods, reissue === null || reissue === void 0 ? void 0 : reissue[SUBMIT_COMPONENT_REISSUE_MAP[item.workOrderComponentType].goods]);
-    addContent(SUBMIT_COMPONENT_REISSUE_MAP[item.workOrderComponentType].shopCode, (reissue === null || reissue === void 0 ? void 0 : reissue.shopCode) || '');
+    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 === 'GY_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未复现出丢失情况，兜底措施
     if (item.workOrderComponentType === 'GY_REISSUE_GOODS') {
-      addContent(SUBMIT_COMPONENT_REISSUE_MAP[item.workOrderComponentType].vipCode, (reissue === null || reissue === void 0 ? void 0 : reissue.vipCode) || '');
+      if (reissue !== null && reissue !== void 0 && reissue.vipCode) {
+        addContent(SUBMIT_COMPONENT_REISSUE_MAP[item.workOrderComponentType].vipCode, (reissue === null || reissue === void 0 ? void 0 : reissue.vipCode) || '');
+      } else if (!(reissue !== null && reissue !== void 0 && reissue.vipCode)) {
+        var _gySystemOrderReissue, _gySystemOrderReissue4;
+        var gySystemOrderKey = '7340df9620';
+        var gySystemOrderReissue = getNowData(gySystemOrderKey, {});
+        if ((gySystemOrderReissue === null || gySystemOrderReissue === void 0 ? void 0 : (_gySystemOrderReissue = gySystemOrderReissue.orders) === null || _gySystemOrderReissue === void 0 ? void 0 : _gySystemOrderReissue.length) > 0) {
+          var _gySystemOrderReissue2, _gySystemOrderReissue3;
+          addContent(SUBMIT_COMPONENT_REISSUE_MAP[item.workOrderComponentType].vipCode, (gySystemOrderReissue === null || gySystemOrderReissue === void 0 ? void 0 : (_gySystemOrderReissue2 = gySystemOrderReissue.orders) === null || _gySystemOrderReissue2 === void 0 ? void 0 : (_gySystemOrderReissue3 = _gySystemOrderReissue2[0]) === null || _gySystemOrderReissue3 === void 0 ? void 0 : _gySystemOrderReissue3.vipCode) || '');
+        } else if ((gySystemOrderReissue === null || gySystemOrderReissue === void 0 ? void 0 : (_gySystemOrderReissue4 = gySystemOrderReissue.systemShowOrder) === null || _gySystemOrderReissue4 === void 0 ? void 0 : _gySystemOrderReissue4.length) > 0) {
+          var _gySystemOrderReissue5, _gySystemOrderReissue6;
+          addContent(SUBMIT_COMPONENT_REISSUE_MAP[item.workOrderComponentType].vipCode, (gySystemOrderReissue === null || gySystemOrderReissue === void 0 ? void 0 : (_gySystemOrderReissue5 = gySystemOrderReissue.systemShowOrder) === null || _gySystemOrderReissue5 === void 0 ? void 0 : (_gySystemOrderReissue6 = _gySystemOrderReissue5[0]) === null || _gySystemOrderReissue6 === void 0 ? void 0 : _gySystemOrderReissue6.vipCode) || '');
+        }
+      }
+      if (reissue !== null && reissue !== void 0 && reissue.shopCode) {
+        addContent(SUBMIT_COMPONENT_REISSUE_MAP[item.workOrderComponentType].shopCode, (reissue === null || reissue === void 0 ? void 0 : reissue.shopCode) || '');
+      } else if (!(reissue !== null && reissue !== void 0 && reissue.shopCode)) {
+        var _gySystemOrderReissue8, _gySystemOrderReissue11;
+        var _gySystemOrderKey = '7340df9620';
+        var _gySystemOrderReissue7 = getNowData(_gySystemOrderKey, {});
+        if ((_gySystemOrderReissue7 === null || _gySystemOrderReissue7 === void 0 ? void 0 : (_gySystemOrderReissue8 = _gySystemOrderReissue7.orders) === null || _gySystemOrderReissue8 === void 0 ? void 0 : _gySystemOrderReissue8.length) > 0) {
+          var _gySystemOrderReissue9, _gySystemOrderReissue10;
+          addContent(SUBMIT_COMPONENT_REISSUE_MAP[item.workOrderComponentType].shopCode, (_gySystemOrderReissue7 === null || _gySystemOrderReissue7 === void 0 ? void 0 : (_gySystemOrderReissue9 = _gySystemOrderReissue7.orders) === null || _gySystemOrderReissue9 === void 0 ? void 0 : (_gySystemOrderReissue10 = _gySystemOrderReissue9[0]) === null || _gySystemOrderReissue10 === void 0 ? void 0 : _gySystemOrderReissue10.shopCode) || '');
+        } else if ((_gySystemOrderReissue7 === null || _gySystemOrderReissue7 === void 0 ? void 0 : (_gySystemOrderReissue11 = _gySystemOrderReissue7.systemShowOrder) === null || _gySystemOrderReissue11 === void 0 ? void 0 : _gySystemOrderReissue11.length) > 0) {
+          var _gySystemOrderReissue12, _gySystemOrderReissue13;
+          addContent(SUBMIT_COMPONENT_REISSUE_MAP[item.workOrderComponentType].shopCode, (_gySystemOrderReissue7 === null || _gySystemOrderReissue7 === void 0 ? void 0 : (_gySystemOrderReissue12 = _gySystemOrderReissue7.systemShowOrder) === null || _gySystemOrderReissue12 === void 0 ? void 0 : (_gySystemOrderReissue13 = _gySystemOrderReissue12[0]) === null || _gySystemOrderReissue13 === void 0 ? void 0 : _gySystemOrderReissue13.shopCode) || '');
+        }
+      }
+      //无vipCode上报日志
+      if (!(reissue !== null && reissue !== void 0 && reissue.vipCode)) {
+        Monitor.sendClick({
+          spmClick: 'notVipCode_addContent',
+          spmParam: JSON.stringify(Object.prototype.toString.call(reissue) === '[object Object]' ? reissue : {})
+        });
+      }
+    }
+    if (item.workOrderComponentType === 'JST_REISSUE_GOODS') {
+      addContent(SUBMIT_COMPONENT_REISSUE_MAP[item.workOrderComponentType].systemOrderBillType, (reissue === null || reissue === void 0 ? void 0 : reissue[SUBMIT_COMPONENT_REISSUE_MAP[item.workOrderComponentType].systemOrderBillType]) || '');
     }
   };
 };
-var handleBsOrWdtReturnGoods = function handleBsOrWdtReturnGoods(_ref38) {
-  var addContent = _ref38.addContent,
-    getNowData = _ref38.getNowData;
+var handleBsOrWdtReturnGoods = function handleBsOrWdtReturnGoods(_ref37) {
+  var addContent = _ref37.addContent,
+    getNowData = _ref37.getNowData;
   return function (item) {
     var currentReturn = getNowData(item.uniqueKey, {});
     var compType = item.workOrderComponentType;
@@ -517,9 +544,9 @@ var handleBsOrWdtReturnGoods = function handleBsOrWdtReturnGoods(_ref38) {
     addContent(SUBMIT_COMPONENT_RETURN_GOODS_MAP[compType].shopCodeKey, (currentReturn === null || currentReturn === void 0 ? void 0 : currentReturn[SUBMIT_COMPONENT_RETURN_GOODS_MAP[compType].shopCodeKey]) || '');
   };
 };
-var handleBsPosting = function handleBsPosting(_ref39) {
-  var addContent = _ref39.addContent,
-    getNowData = _ref39.getNowData;
+var handleBsPosting = function handleBsPosting(_ref38) {
+  var addContent = _ref38.addContent,
+    getNowData = _ref38.getNowData;
   return function (item) {
     ['bsPostingProvince', 'bsPostingCity', 'bsPostingDistrict'].map(function (key, index) {
       addContent(key, getNowData("".concat(item.uniqueKey, ".postingAddress[").concat(index, "]"), ''));
@@ -529,9 +556,9 @@ var handleBsPosting = function handleBsPosting(_ref39) {
     addContent('bsPostingReceiverMobile', getNowData("".concat(item.uniqueKey, ".postingReceiverMobile"), ''));
   };
 };
-var handleSystemOrder = function handleSystemOrder(_ref40) {
-  var addContent = _ref40.addContent,
-    getNowData = _ref40.getNowData;
+var handleSystemOrder = function handleSystemOrder(_ref39) {
+  var addContent = _ref39.addContent,
+    getNowData = _ref39.getNowData;
   return function (item) {
     var selectIds = getNowData("".concat(item.uniqueKey, ".selectIds"), '');
     var showOrderInfo = getNowData("".concat(item.uniqueKey, ".showOrderInfo"), []);
@@ -545,16 +572,16 @@ var handleSystemOrder = function handleSystemOrder(_ref40) {
     }));
   };
 };
-var handleBuyerMessageNotice = function handleBuyerMessageNotice(_ref41) {
-  var addContent = _ref41.addContent,
-    getNowData = _ref41.getNowData;
+var handleBuyerMessageNotice = function handleBuyerMessageNotice(_ref40) {
+  var addContent = _ref40.addContent,
+    getNowData = _ref40.getNowData;
   return function (item) {
     addContent('buyerMessageNotice', getNowData(item.uniqueKey, '未通知'));
   };
 };
-var handleBsDeliveryNo = function handleBsDeliveryNo(_ref42) {
-  var addContent = _ref42.addContent,
-    getNowData = _ref42.getNowData;
+var handleBsDeliveryNo = function handleBsDeliveryNo(_ref41) {
+  var addContent = _ref41.addContent,
+    getNowData = _ref41.getNowData;
   return function (item) {
     var deliveryNoList = getNowData(item.uniqueKey, []);
     addContent('deliveryNoList', deliveryNoList);
@@ -563,9 +590,9 @@ var handleBsDeliveryNo = function handleBsDeliveryNo(_ref42) {
     }));
   };
 };
-var handleReturnGoodsTradeId = function handleReturnGoodsTradeId(_ref43) {
-  var addContent = _ref43.addContent,
-    getNowData = _ref43.getNowData;
+var handleReturnGoodsTradeId = function handleReturnGoodsTradeId(_ref42) {
+  var addContent = _ref42.addContent,
+    getNowData = _ref42.getNowData;
   return function (item) {
     var returnGoodsTradeItemList = getNowData(item.uniqueKey, []);
     addContent('returnGoodsTradeItemList', returnGoodsTradeItemList);
@@ -574,9 +601,9 @@ var handleReturnGoodsTradeId = function handleReturnGoodsTradeId(_ref43) {
     }));
   };
 };
-var handleErpTradeId = function handleErpTradeId(_ref44) {
-  var addContent = _ref44.addContent,
-    getNowData = _ref44.getNowData;
+var handleErpTradeId = function handleErpTradeId(_ref43) {
+  var addContent = _ref43.addContent,
+    getNowData = _ref43.getNowData;
   return function (item) {
     var tradeItemList = getNowData(item.uniqueKey, []);
     addContent('tradeItemList', tradeItemList);
@@ -585,18 +612,18 @@ var handleErpTradeId = function handleErpTradeId(_ref44) {
     }));
   };
 };
-var handleWlnGoods = function handleWlnGoods(_ref45) {
-  var addContent = _ref45.addContent,
-    getNowData = _ref45.getNowData;
+var handleWlnGoods = function handleWlnGoods(_ref44) {
+  var addContent = _ref44.addContent,
+    getNowData = _ref44.getNowData;
   return function (item) {
     var wlnGoods = getNowData(item.uniqueKey, {});
     addContent('wlnGoods', wlnGoods.wlnGoods);
     addContent('shopCode', (wlnGoods === null || wlnGoods === void 0 ? void 0 : wlnGoods.shopCode) || '');
   };
 };
-var handleBsE3ReissueGoods = function handleBsE3ReissueGoods(_ref46) {
-  var addContent = _ref46.addContent,
-    getNowData = _ref46.getNowData;
+var handleBsE3ReissueGoods = function handleBsE3ReissueGoods(_ref45) {
+  var addContent = _ref45.addContent,
+    getNowData = _ref45.getNowData;
   return function (item) {
     ['bsE3SystemOrderNo', 'bsE3ReissueType', 'bsE3ReissueMemo', 'bsE3ReissueGoods'].map(function (key) {
       if (key === 'bsE3ReissueGoods') {
@@ -607,24 +634,24 @@ var handleBsE3ReissueGoods = function handleBsE3ReissueGoods(_ref46) {
     });
   };
 };
-var handleDefault = function handleDefault(_ref47) {
-  var addContent = _ref47.addContent,
-    getNowData = _ref47.getNowData;
+var handleDefault = function handleDefault(_ref46) {
+  var addContent = _ref46.addContent,
+    getNowData = _ref46.getNowData;
   return function (item) {
     addContent(V.camelCase(item.workOrderComponentType), getNowData(item.uniqueKey, ''));
   };
 };
-var handleStatusField = function handleStatusField(_ref48) {
-  var addContent = _ref48.addContent,
-    getNowData = _ref48.getNowData;
+var handleStatusField = function handleStatusField(_ref47) {
+  var addContent = _ref47.addContent,
+    getNowData = _ref47.getNowData;
   return function (item) {
     addContent(SUBMIT_COMPONENT_STATUS_MAP[item.workOrderComponentType].status, getNowData("".concat(item.uniqueKey, ".status"), ''));
     addContent(SUBMIT_COMPONENT_STATUS_MAP[item.workOrderComponentType].reason, getNowData("".concat(item.uniqueKey, ".reason"), ''));
   };
 };
-var handleGoodStatus = function handleGoodStatus(_ref49) {
-  var addContent = _ref49.addContent,
-    getNowData = _ref49.getNowData;
+var handleGoodStatus = function handleGoodStatus(_ref48) {
+  var addContent = _ref48.addContent,
+    getNowData = _ref48.getNowData;
   return function (item) {
     addContent(SUBMIT_COMPONENT_GOOD_STATUS_MAP[item.workOrderComponentType].list, getNowData("".concat(item.uniqueKey), []));
     addContent(SUBMIT_COMPONENT_GOOD_STATUS_MAP[item.workOrderComponentType].status, getNowData("".concat(item.uniqueKey), []).map(function (item) {
@@ -632,13 +659,13 @@ var handleGoodStatus = function handleGoodStatus(_ref49) {
     }));
   };
 };
-var processComponent = function processComponent(_ref50) {
-  var params = _ref50.params,
-    nowData = _ref50.nowData,
-    updateFlag = _ref50.updateFlag,
-    detail = _ref50.detail,
-    accountName = _ref50.accountName,
-    getValueByField = _ref50.getValueByField;
+var processComponent = function processComponent(_ref49) {
+  var params = _ref49.params,
+    nowData = _ref49.nowData,
+    updateFlag = _ref49.updateFlag,
+    detail = _ref49.detail,
+    accountName = _ref49.accountName,
+    getValueByField = _ref49.getValueByField;
   return function (item) {
     var contentVoList = [];
     var uniqueKeyPrefix = "".concat(item.uniqueKey, "_");
@@ -770,9 +797,6 @@ var processComponent = function processComponent(_ref50) {
       case 'ENTERPRISE_PAYMENT':
         wrapFn(handleEnterprisePayment);
         break;
-      case 'JST_LOGISTICS':
-        wrapFn(handleJstLogistics);
-        break;
       case 'JST_SUPPLY':
         wrapFn(handleJstSupply);
         break;
@@ -785,6 +809,7 @@ var processComponent = function processComponent(_ref50) {
       case 'REISSUE_LOGISTICS':
         wrapFn(handleReissueLogistics);
         break;
+      case 'JST_LOGISTICS':
       case 'BS_LOGISTICS':
       case 'WLN_LOGISTICS':
       case 'WDT_LOGISTICS':

package/dist/esm/common/utils/tools.d.ts

@@ -39,7 +39,7 @@ export declare const calcWorkOrderList: (source: Partial<WorkOrderDetail>[], tem
     workOrderComponentType: string;
     uniqueKey: string;
 }[], type?: string) => any[];
-export declare const orderBack: ({ order_no, form, shopId, shopList, templateDetail, type, callback, fromQNCreateWorkOrderByOrderNo, plat, }: any) => Promise<void>;
+export declare const orderBack: ({ order_no, form, shopId: propsShopid, shopList, templateDetail, type, callback, fromQNCreateWorkOrderByOrderNo, plat, callbackShopId, }: any) => Promise<void>;
 export declare const imgResize: (url: string, w?: number, h?: number) => string;
 export declare const COMPONENT_MAP: {
     [key: string]: string;

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

@@ -19,7 +19,7 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import { message } from 'antd';
 import { get, last, cloneDeep, isEqual, set } from 'lodash';
-import { orderDetail } from "../../model/servers/api";
+import { orderDetail, queryShopByTid } from "../../model/servers/api";
 import moment from 'moment';
 import { AddressData, ExpressData, ExpressInterceptData, orderBackFormValues, bsOrderBackFormValues, kmOrderBackFormValues, bsE3OrderBackFormValues, wlnOrderBackFormValues, wdtOrderBackFormValues, jstOrderBackFormValues, request, isNull, bsOrderTransform, bsE3OrderTransform, jstOrderTransform, filterJstOrders, wlnOrderTransform, wdtOrderTransform, kmOrderTransform, filterBsE3Orders, filterWdtOrders, filterKmOrders, unTransField, transMultSelectOptions, gyOrderBackFormValues, gyOrderTransform, filterGyOrders, setSessionStorage } from '@kmkf-fe-packages/kmkf-utils';
 import Monitor from 'kmkf-monitor';
@@ -131,11 +131,39 @@ var getBasicsOrderInfo = function getBasicsOrderInfo(orderInfo, xiaozhiOrder) {
 //订单返填
 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, hasFlagMap, _ref3, shopSourceStr, _ref3$thirdUserNick, thirdUserNick, thirdShopSubType, _data$value, _data$value3, _jstOrder$value, _jstOrder$value2, _bsOrder$value, _wlnOrder$value, _wdtOrder$value, _bsE3Order$value, _kmOrder$value, _gyOrder$value, _bsOrders$orders, _bsE3Orders$orderList, _wlnOrders$orders, _wdtOrders$trades, _gyOrders$trades, _kmOrders$orderDetail, promise, _yield$Promise$allSet, _yield$Promise$allSet2, data, xiaozhiOrder, jstOrder, bsOrder, wlnOrder, wdtOrder, bsE3Order, kmOrder, gyOrder, _data$value2, orderInfo, jstOrders, bsOrders, wlnOrders, wdtOrders, bsE3Orders, kmOrders, gyOrders, bsInfo, wlnInfo, bsE3Info, wdtInfo, kmInfo, gyInfo, jstInfo, formValue, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, values, paymentUniqueKey;
+    var order_no, form, propsShopid, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, callbackShopId, shopId, _res$data, _res$data2, _res$data4, res, _res$data3, _res$data5, JOIN_SHOP, hasFlagMap, _ref3, shopSourceStr, _ref3$thirdUserNick, thirdUserNick, thirdShopSubType, _data$value, _data$value3, _jstOrder$value, _jstOrder$value2, _bsOrder$value, _wlnOrder$value, _wdtOrder$value, _bsE3Order$value, _kmOrder$value, _gyOrder$value, _bsOrders$orders, _bsE3Orders$orderList, _wlnOrders$orders, _wdtOrders$trades, _gyOrders$trades, _kmOrders$orderDetail, promise, _yield$Promise$allSet, _yield$Promise$allSet2, data, xiaozhiOrder, jstOrder, bsOrder, wlnOrder, wdtOrder, bsE3Order, kmOrder, gyOrder, _data$value2, orderInfo, jstOrders, bsOrders, wlnOrders, wdtOrders, bsE3Orders, kmOrders, gyOrders, bsInfo, wlnInfo, bsE3Info, wdtInfo, kmInfo, gyInfo, jstInfo, formValue, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, 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, shopId = _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;
+          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;
+          shopId = propsShopid; //如果是pc平台且没有shopId的情况下 获取shopId
+          if (!(order_no && plat.platform === PlatForm.PC && !!(plat !== null && plat !== void 0 && plat.bindERP) && type === 'add')) {
+            _context.next = 13;
+            break;
+          }
+          _context.prev = 3;
+          _context.next = 6;
+          return queryShopByTid({
+            tid: order_no
+          });
+        case 6:
+          res = _context.sent;
+          if (res !== null && res !== void 0 && (_res$data = res.data) !== null && _res$data !== void 0 && _res$data.shopId && !(res !== null && res !== void 0 && (_res$data2 = res.data) !== null && _res$data2 !== void 0 && _res$data2.auditStatus)) {
+            message.error("\u5339\u914D\u5E97\u94FA\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5".concat(res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.shopName, "\u6388\u6743\u662F\u5426\u6B63\u5E38"));
+          } else if (res !== null && res !== void 0 && (_res$data4 = res.data) !== null && _res$data4 !== void 0 && _res$data4.shopId) {
+            shopId = res === null || res === void 0 ? void 0 : (_res$data5 = res.data) === null || _res$data5 === void 0 ? void 0 : _res$data5.shopId;
+            // form.setFieldsValue({
+            //   shopId,
+            // });
+            callbackShopId === null || callbackShopId === void 0 ? void 0 : callbackShopId(shopId);
+          }
+          _context.next = 13;
+          break;
+        case 10:
+          _context.prev = 10;
+          _context.t0 = _context["catch"](3);
+          console.error(_context.t0);
+        case 13:
           //是否是对接平台，只有对接平台才能返填订单号
           JOIN_SHOP = shopList.find(function (item) {
             return !item.notJoin && item.shopId == shopId;
@@ -151,15 +179,15 @@ export var orderBack = /*#__PURE__*/function () {
           }).every(function (item) {
             return item === false;
           }))) {
-            _context.next = 5;
+            _context.next = 17;
             break;
           }
           return _context.abrupt("return");
-        case 5:
+        case 17:
           _ref3 = shopList.find(function (item) {
             return item.shopId == shopId;
           }) || {}, shopSourceStr = _ref3.shopSourceStr, _ref3$thirdUserNick = _ref3.thirdUserNick, thirdUserNick = _ref3$thirdUserNick === void 0 ? '' : _ref3$thirdUserNick, thirdShopSubType = _ref3.thirdShopSubType;
-          _context.prev = 6;
+          _context.prev = 18;
           promise = [];
           if (!JOIN_SHOP || thirdShopSubType === 1 && shopSourceStr === 'JD') {
             promise.push(Promise.resolve([]));
@@ -194,9 +222,9 @@ export var orderBack = /*#__PURE__*/function () {
           });
 
           //需按照orderBackMap中的顺序结构
-          _context.next = 13;
+          _context.next = 25;
           return Promise.allSettled(promise);
-        case 13:
+        case 25:
           _yield$Promise$allSet = _context.sent;
           _yield$Promise$allSet2 = _slicedToArray(_yield$Promise$allSet, 9);
           data = _yield$Promise$allSet2[0];
@@ -378,7 +406,7 @@ export var orderBack = /*#__PURE__*/function () {
           hasSelectItem = HasErpItemSelectHandle(templateDetail);
           erpPromiseList = [];
           if (!(shopSourceStr === 'TAOBAO' && hasSelectItem)) {
-            _context.next = 73;
+            _context.next = 85;
             break;
           }
           list = detail['itemList'];
@@ -396,10 +424,10 @@ export var orderBack = /*#__PURE__*/function () {
               resolve({});
             });
           });
-          _context.prev = 63;
-          _context.next = 66;
+          _context.prev = 75;
+          _context.next = 78;
           return Promise.all(promises);
-        case 66:
+        case 78:
           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), {}, {
@@ -409,13 +437,13 @@ export var orderBack = /*#__PURE__*/function () {
               })
             });
           });
-          _context.next = 73;
+          _context.next = 85;
           break;
-        case 70:
-          _context.prev = 70;
-          _context.t0 = _context["catch"](63);
-          console.error('调用erp获取宝贝编码错误', _context.t0);
-        case 73:
+        case 82:
+          _context.prev = 82;
+          _context.t1 = _context["catch"](75);
+          console.error('调用erp获取宝贝编码错误', _context.t1);
+        case 85:
           // console.log('detail', detail);
           values = orderBackFormValues({
             detail: detail,
@@ -453,21 +481,23 @@ export var orderBack = /*#__PURE__*/function () {
             }
           }
           // console.log('orderback', values);
+
           form.setFieldsValue(_objectSpread(_objectSpread(_objectSpread({}, formValue), values), {}, {
-            fixed_field_buyerOpenUid: orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.buyerOpenUid
+            fixed_field_buyerOpenUid: orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.buyerOpenUid,
+            shopId: shopId
           }));
           callback === null || callback === void 0 ? void 0 : callback(detail, templateDetail);
-          _context.next = 84;
+          _context.next = 96;
           break;
-        case 81:
-          _context.prev = 81;
-          _context.t1 = _context["catch"](6);
-          console.error(_context.t1);
-        case 84:
+        case 93:
+          _context.prev = 93;
+          _context.t2 = _context["catch"](18);
+          console.error(_context.t2);
+        case 96:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[6, 81], [63, 70]]);
+    }, _callee, null, [[3, 10], [18, 93], [75, 82]]);
   }));
   return function orderBack(_x) {
     return _ref2.apply(this, arguments);
@@ -1008,7 +1038,7 @@ export var gySystemOrderBackValues = function gySystemOrderBackValues(_ref11) {
   }, form);
   var values = gyOrderBackFormValues(orderInfo, {
     componentDtoList: gyGoodsComponent
-  });
+  }, 2);
   console.log('values', values);
   form.setFieldsValue(values);
 };

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

@@ -16,7 +16,6 @@ export var orderBackMap = function orderBackMap(_ref) {
     //判断是否有聚水潭组件 有就请求jst订单接口
     hasJst: {
       flag: HasFilterHandle(templateDetail, orderBackKeyListMap.hasJst),
-      andJsonShop: true,
       promiseRequest: function promiseRequest() {
         return jstOrderDetail({
           soId: order_no

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

@@ -833,6 +833,7 @@ var processJstReissueGoods = function processJstReissueGoods(templateColumns) {
         },
         jstReissueType: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_jstReissueType")), ['1']),
         jstReissueGoods: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_jstReissueGoods")), []),
+        jstSystemOrderBillType: getValue("".concat(nex.uniqueKey, "_jstSystemOrderBillType")) || '',
         shopCode: getValue("".concat(nex.uniqueKey, "_shopCode")),
         jstSystemOrderNo: getValue("".concat(nex.uniqueKey, "_jstSystemOrderNo"))
       });

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

@@ -6,6 +6,7 @@ export declare const selectDeleteCustomizeWorkOrderModalVisible: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -19,6 +20,7 @@ export declare const selectorDealerModalVisible: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -32,6 +34,7 @@ export declare const selectorCompanyUserList: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => import("./types").CompanyUserListI[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => import("./types").CompanyUserListI[], {
     clearCache: () => void;
 }> & {
@@ -45,6 +48,7 @@ export declare const selectorSelectedCompanyUserList: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => string[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => string[], {
     clearCache: () => void;
 }> & {
@@ -58,6 +62,7 @@ export declare const selectorModalVisible: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -71,6 +76,7 @@ export declare const selectorLogModalVisible: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -84,6 +90,7 @@ export declare const selectorFormModalVisible: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -97,6 +104,7 @@ export declare const selectorTemplateId: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => string) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => string, {
     clearCache: () => void;
 }> & {
@@ -110,6 +118,7 @@ export declare const selectorLogicFlowId: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => string) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => string, {
     clearCache: () => void;
 }> & {
@@ -123,6 +132,7 @@ export declare const selectorFlowWorkOrderId: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => string) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => string, {
     clearCache: () => void;
 }> & {
@@ -136,6 +146,7 @@ export declare const selectorCurrentShopId: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => string) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => string, {
     clearCache: () => void;
 }> & {
@@ -149,6 +160,7 @@ export declare const selectorCurrentCustomizeRecord: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => any) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => any, {
     clearCache: () => void;
 }> & {
@@ -162,6 +174,7 @@ export declare const selectorCurrentBuyerChecked: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -175,6 +188,7 @@ export declare const selectorAllTemplateList: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => import("./types").ComponentColumnsT[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => import("./types").ComponentColumnsT[], {
     clearCache: () => void;
 }> & {
@@ -188,6 +202,7 @@ export declare const selectRepeatVisible: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -201,6 +216,7 @@ export declare const selectRepeatWorkOrderConditions: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => import("./types").ConditionsT) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => import("./types").ConditionsT, {
     clearCache: () => void;
 }> & {
@@ -214,6 +230,7 @@ export declare const selectCancelInterceptionModalVisible: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -227,6 +244,7 @@ export declare const selectShowPayment: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {

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

@@ -27,6 +27,7 @@ export interface PlatFormInfo {
     shopId?: string;
     companyKey: string;
     subOrderNo?: string;
+    bindERP?: boolean;
 }
 export declare type CurrentNodeDetail = Pick<QyFlowPanelInfoResponse, 'currentNodeDetail'>;
 export declare type CurrentFlowShowHideRules = Pick<QyFlowPanelInfoResponse, 'allShowHideRules'>;

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

@@ -6,6 +6,7 @@ export declare const selectFlowList: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("./types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => import("./types").LogicFlow[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").LogicFlowState) => import("./types").LogicFlow[], {
     clearCache: () => void;
 }> & {
@@ -19,6 +20,7 @@ export declare const selectGroupFlowList: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("./types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => import("./types").Option[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").LogicFlowState) => import("./types").Option[], {
     clearCache: () => void;
 }> & {
@@ -32,6 +34,7 @@ export declare const selectFlowTemplateGroupWorkOrderTemplateList: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("./types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => import("./types").Option[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").LogicFlowState) => import("./types").Option[], {
     clearCache: () => void;
 }> & {

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

@@ -6,6 +6,7 @@ export declare const selectPaymentWorkOrderExamineModalVisible: ((state: {
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -19,6 +20,7 @@ export declare const selectCurrentPaymentRecord: ((state: {
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => any) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => any, {
     clearCache: () => void;
 }> & {
@@ -32,6 +34,7 @@ export declare const selectPaymentWorkOrderUnExamineModalVisible: ((state: {
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -45,6 +48,7 @@ export declare const selectDeletePaymentWorkOrderVisible: ((state: {
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -58,6 +62,7 @@ export declare const selectFlagPayModalVisible: ((state: {
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -71,6 +76,7 @@ export declare const selectLogModalVisible: ((state: {
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -84,6 +90,7 @@ export declare const selectPaymentFormModalVisible: ((state: {
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -97,6 +104,7 @@ export declare const selectRepeatVisible: ((state: {
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -110,6 +118,7 @@ export declare const selectRepeatWorkOrderList: ((state: {
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => string[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => string[], {
     clearCache: () => void;
 }> & {

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

@@ -90,3 +90,4 @@ export declare const queryMemberLevel: (data: {
     shopId: string;
     tid: string;
 }) => Promise<serverProps<Array<string>>>;
+export declare const queryShopByTid: (data: any) => Promise<any>;

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

@@ -555,4 +555,13 @@ export var queryMemberLevel = function queryMemberLevel(data) {
     method: 'post',
     data: data
   });
+};
+
+//通过订单号获取shopId
+export var queryShopByTid = function queryShopByTid(data) {
+  return request({
+    url: '/qy/gdfw/order/queryShopByTid',
+    method: 'post',
+    data: data
+  });
 };

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

@@ -6,6 +6,7 @@ export declare const selectorSingleTemplateList: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("./types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => import("./types").SelectI[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => import("./types").SelectI[], {
     clearCache: () => void;
 }> & {
@@ -19,6 +20,7 @@ export declare const selectDeleteCustomizeWorkOrderModalVisible: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("./types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -32,6 +34,7 @@ export declare const selectorCurrentCustomizeRecord: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("./types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => any) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => any, {
     clearCache: () => void;
 }> & {
@@ -45,6 +48,7 @@ export declare const selectorTemplateId: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("./types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => string) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => string, {
     clearCache: () => void;
 }> & {
@@ -58,6 +62,7 @@ export declare const selectorFormModalVisible: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("./types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
-  "version": "2.0.12-beta.2",
+  "version": "2.0.12-beta.21",
   "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.0.12-beta.2",
-    "@kmkf-fe-packages/kmkf-utils": "2.0.12-beta.2",
-    "@kmkf-fe-packages/services-components": "2.0.12-beta.2",
+    "@kmkf-fe-packages/basic-components": "2.0.12-beta.11",
+    "@kmkf-fe-packages/kmkf-utils": "2.0.12-beta.11",
+    "@kmkf-fe-packages/services-components": "2.0.12-beta.21",
     "@reduxjs/toolkit": "^1.8.5",
     "ahooks": "^3.7.4",
     "copy-to-clipboard": "^3.3.3",
@@ -73,7 +73,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "633250aff84497bea16c4fe0ccddfbf99fe835ef",
+  "gitHead": "689b7c58f3eef5f31517de5ea86bbed12595bfeb",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }