@kmkf-fe-packages/kmkf-work-order-service-component 2.0.12-beta.3 → 2.0.12-beta.30

package/dist/esm/FlowTemplateDetailV2/common.js

@@ -46,7 +46,7 @@ export var FLOW_STATUS_V2 = {
   RETURNING: '回退中'
 };
 //不能回填的组件type
-export var CANNOT_BACK_FILL = ['LOGISTICS_TRAJECTORY', 'LOGISTICS_TRAJECTORY_MORE', 'BUYER_MESSAGE_NOTICE', 'MSG_STATUS', 'NEW_PAYMENT_STATUS', 'REISSUE_STATUS', 'REISSUE_LOGISTICS', 'RETURN_GOODS_STATUS', 'RETURN_GOODS_TRADE_ID', 'ADJUST_WORK_ORDER_STATUS', 'INVOICE_STATUS', 'INVOICING_STATUS', 'EXCHANGE_STATUS', 'WAREHOUSING_STATUS', 'BS_E3_WAREHOUSING_STATUS', 'EXCHANGE_TRADE_ID', 'REISSUE_TRADE_ID', 'AFTER_SALE_TRADE_ID', 'LOGISTICS_INTERCEPTION', 'LOGISTICS_INTERCEPTION_MORE', 'ORDER_TYPE'];
+export var CANNOT_BACK_FILL = ['LOGISTICS_TRAJECTORY', 'LOGISTICS_TRAJECTORY_MORE', 'BUYER_MESSAGE_NOTICE', 'MSG_STATUS', 'NEW_PAYMENT_STATUS', 'REISSUE_STATUS', 'REISSUE_LOGISTICS', 'RETURN_GOODS_STATUS', 'RETURN_GOODS_TRADE_ID', 'ADJUST_WORK_ORDER_STATUS', 'INVOICE_STATUS', 'INVOICING_STATUS', 'EXCHANGE_STATUS', 'WAREHOUSING_STATUS', 'BS_E3_WAREHOUSING_STATUS', 'EXCHANGE_TRADE_ID', 'REISSUE_TRADE_ID', 'ERP_AFTER_SALE_TRADE_ID', 'LOGISTICS_INTERCEPTION', 'LOGISTICS_INTERCEPTION_MORE', 'ORDER_TYPE'];
 export var verifyHandle = function verifyHandle(data, componentDtoList) {
   var _componentDtoList$fin, _componentDtoList$fin2, _data$paymentUniqueKe, _data$paymentUniqueKe2;
   var res = {

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
         });
       }
     }
@@ -983,7 +997,7 @@ var FormRender = function FormRender(props, ref) {
       var _ref6 = (componentConfig === null || componentConfig === void 0 ? void 0 : componentConfig.status) || {},
         upgrade = _ref6.upgrade,
         created = _ref6.created;
-      if (['REISSUE_TRADE_ID', 'EXCHANGE_TRADE_ID', 'AFTER_SALE_TRADE_ID'].includes(workOrderComponentType)) {
+      if (['REISSUE_TRADE_ID', 'EXCHANGE_TRADE_ID', 'ERP_AFTER_SALE_TRADE_ID'].includes(workOrderComponentType)) {
         // 售后单id、补发单id和换货单id默认值是可见不可编辑（2）
         if (typeof upgrade !== 'number') {
           upgrade = 2;

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/constant.js

@@ -1,2 +1,2 @@
 // 切换当前店铺时，以下组件字段需要清空
-export var NEED_CLEAR_FIELDS_WHEN_SHOP_ID_CHANGE = ['BS_E3_LOGISTICS', 'BS_E3_SEND_GOOD', 'ITEM_SELECT_THIRD', 'STATUS', 'ITEM_SELECT', 'ITEM_ID', 'ITEM_ENCODE', 'JST_LOGISTICS', 'JST_ITEM_SELECT_THIRD', 'JST_SUPPLY', 'JST_SEND_GOOD', 'BS_GOODS', 'BS_EXCHANGE_GOODS', 'BS_REISSUE_GOODS', 'BS_RETURN_GOODS', 'BS_LOGISTICS', 'BS_SEND_GOOD', 'BS_SYSTEM_ORDER', 'WLN_SYSTEM_ORDER', 'WLN_GOODS', 'WLN_LOGISTICS', 'WLN_SEND_GOOD', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WDT_SYSTEM_ORDER', 'WDT_REISSUE_GOODS', 'WDT_RETURN_GOODS', 'WDT_EXCHANGE_GOODS', 'KM_SYSTEM_ORDER', 'KM_SEND_GOOD', 'KM_LOGISTICS', 'BS_E3_SYSTEM_ORDER', 'JST_SYSTEM_ORDER', 'JST_GOODS', 'JST_REISSUE_GOODS', 'BS_E3_REISSUE_GOODS', 'GY_SYSTEM_ORDER', 'GY_SEND_GOOD', 'GY_GOODS', 'GY_REISSUE_GOODS'];
+export var NEED_CLEAR_FIELDS_WHEN_SHOP_ID_CHANGE = ['BS_E3_LOGISTICS', 'BS_E3_SEND_GOOD', 'ITEM_SELECT_THIRD', 'STATUS', 'ITEM_SELECT', 'ITEM_ID', 'ITEM_ENCODE', 'JST_LOGISTICS', 'JST_ITEM_SELECT_THIRD', 'JST_SUPPLY', 'JST_SEND_GOOD', 'BS_GOODS', 'BS_EXCHANGE_GOODS', 'BS_REISSUE_GOODS', 'BS_RETURN_GOODS', 'BS_LOGISTICS', 'BS_SEND_GOOD', 'BS_SYSTEM_ORDER', 'WLN_SYSTEM_ORDER', 'WLN_GOODS', 'WLN_LOGISTICS', 'WLN_SEND_GOOD', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WDT_SYSTEM_ORDER', 'WDT_REISSUE_GOODS', 'WDT_RETURN_GOODS', 'WDT_EXCHANGE_GOODS', 'KM_SYSTEM_ORDER', 'KM_SEND_GOOD', 'KM_LOGISTICS', 'BS_E3_SYSTEM_ORDER', 'JST_SYSTEM_ORDER', 'JST_GOODS', 'JST_REISSUE_GOODS', 'JST_RETURN_GOODS', 'JST_EXCHANGE_GOODS', 'BS_E3_REISSUE_GOODS', 'GY_SYSTEM_ORDER', 'GY_SEND_GOOD', 'GY_GOODS', 'GY_REISSUE_GOODS'];

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

@@ -88,7 +88,7 @@ export var DEFAULT_STRING_COMPONENT_TYPE_FIELD_MAPPING = {
   BUSINESS_ORDER_NO: 'businessOrderNo',
   PAYMENT_VOUCHER_CODE: 'paymentVoucherCode',
   BASIC_MULT_SELECT: 'basicMultSelect',
-  ORDER_TYPE: 'orderType'
+  ORDER_TYPE: 'erpOrderType'
 };
 export var DEFAULT_ARRAY_COMPONENT_TYPE_FIELD_MAPPING = {
   RATE: 'rate',
@@ -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,15 @@ export var SUBMIT_COMPONENT_REISSUE_MAP = {
     type: 'jstReissueType',
     goods: 'jstReissueGoods',
     shopCode: 'shopCode',
-    systemOrderNo: 'jstSystemOrderNo'
+    systemOrderNo: 'jstSystemOrderNo',
+    systemOrderBillType: 'jstSystemOrderBillType'
+  },
+  JST_RETURN_GOODS: {
+    type: 'jstReturnType',
+    goods: 'jstReturnGoods',
+    shopCode: 'shopCode',
+    systemOrderNo: 'jstSystemOrderNo',
+    systemOrderBillType: 'jstSystemOrderBillType'
   }
 };
 export var SUBMIT_COMPONENT_RETURN_GOODS_MAP = {

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

@@ -273,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);
@@ -301,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);
@@ -315,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);
@@ -329,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);
@@ -343,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);
@@ -361,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);
@@ -379,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);
@@ -402,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);
@@ -420,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);
@@ -446,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, {});
@@ -482,15 +468,24 @@ 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 handleJstExchangeGoods = function handleJstExchangeGoods(_ref36) {
+  var addContent = _ref36.addContent,
+    getNowData = _ref36.getNowData;
+  return function (item) {
+    var jstExchange = getNowData(item.uniqueKey, {});
+    addContent('jstExchangeGoods', jstExchange === null || jstExchange === void 0 ? void 0 : jstExchange.jstExchangeGoods);
+    addContent('shopCode', (jstExchange === null || jstExchange === void 0 ? void 0 : jstExchange.shopCode) || '');
+  };
+};
 var handleBsOrWdtReissueGoods = function handleBsOrWdtReissueGoods(_ref37) {
   var addContent = _ref37.addContent,
     getNowData = _ref37.getNowData;
@@ -498,12 +493,42 @@ var handleBsOrWdtReissueGoods = function handleBsOrWdtReissueGoods(_ref37) {
     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 === 'WDT_REISSUE_GOODS' || item.workOrderComponentType === 'JST_REISSUE_GOODS' || item.workOrderComponentType === 'GY_REISSUE_GOODS') {
+    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') {
       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({
@@ -512,6 +537,9 @@ var handleBsOrWdtReissueGoods = function handleBsOrWdtReissueGoods(_ref37) {
         });
       }
     }
+    if (item.workOrderComponentType === 'JST_REISSUE_GOODS' || item.workOrderComponentType === 'JST_RETURN_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) {
@@ -778,9 +806,6 @@ var processComponent = function processComponent(_ref50) {
       case 'ENTERPRISE_PAYMENT':
         wrapFn(handleEnterprisePayment);
         break;
-      case 'JST_LOGISTICS':
-        wrapFn(handleJstLogistics);
-        break;
       case 'JST_SUPPLY':
         wrapFn(handleJstSupply);
         break;
@@ -793,6 +818,7 @@ var processComponent = function processComponent(_ref50) {
       case 'REISSUE_LOGISTICS':
         wrapFn(handleReissueLogistics);
         break;
+      case 'JST_LOGISTICS':
       case 'BS_LOGISTICS':
       case 'WLN_LOGISTICS':
       case 'WDT_LOGISTICS':
@@ -829,10 +855,14 @@ var processComponent = function processComponent(_ref50) {
       case 'WDT_EXCHANGE_GOODS':
         wrapFn(handleWdtExchangeGoods);
         break;
+      case 'JST_EXCHANGE_GOODS':
+        wrapFn(handleJstExchangeGoods);
+        break;
       case 'BS_REISSUE_GOODS':
       case 'WDT_REISSUE_GOODS':
       case 'GY_REISSUE_GOODS':
       case 'JST_REISSUE_GOODS':
+      case 'JST_RETURN_GOODS':
         wrapFn(handleBsOrWdtReissueGoods);
         break;
       case 'BS_RETURN_GOODS':
@@ -861,7 +891,7 @@ var processComponent = function processComponent(_ref50) {
         wrapFn(handleReturnGoodsTradeId);
         break;
       case 'REISSUE_TRADE_ID':
-      case 'AFTER_SALE_TRADE_ID':
+      case 'ERP_AFTER_SALE_TRADE_ID':
       case 'EXCHANGE_TRADE_ID':
         wrapFn(handleErpTradeId);
         break;

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;