@kmkf-fe-packages/kmkf-work-order-service-component 2.12.1 → 2.13.3

package/dist/esm/CustomerServiceToDoList/index.js

@@ -85,15 +85,12 @@ var CustomerServiceToDoList = function CustomerServiceToDoList(props) {
       payload: false
     });
   };
-  useEffect(function () {
-    reload();
-  }, []);
   useEffect(function () {
     if (['submit'].includes(workOrderProcessStatus)) {
       reload();
       dispatch(setWorkOrderProcessStatus(''));
     }
-  }, [workOrderProcessStatus, dispatch]);
+  }, [workOrderProcessStatus, dispatch, reload]);
   return /*#__PURE__*/React.createElement("div", {
     className: styles.container,
     onClick: onCancel

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

@@ -74,7 +74,6 @@ var buttonMap = function buttonMap(flowType) {
   };
 };
 var ActionList = function ActionList(props) {
-  var _ref;
   var _props$flowStatus = props.flowStatus,
     flowStatus = _props$flowStatus === void 0 ? FlowStatus.NON_START : _props$flowStatus,
     hasPreNode = props.hasPreNode,
@@ -85,6 +84,7 @@ var ActionList = function ActionList(props) {
     privilege = _props$privilege === void 0 ? '' : _props$privilege,
     _props$showShareButto = props.showShareButton,
     showShareButton = _props$showShareButto === void 0 ? false : _props$showShareButto;
+  var isSinglePageInitialEntry = flowType === FlowType.SINGLE_PAGE && flowStatus === FlowStatus.NON_START;
   var buttonList = useMemo(function () {
     var button = getActionMap(flowStatus, hasPreNode, flowType);
     //如果是没有按钮权限 ｜｜ 分享过来的 则不显示分享按钮
@@ -97,11 +97,20 @@ var ActionList = function ActionList(props) {
     if (privilege === 'created') {
       return ['submit'];
     }
+    if (isSinglePageInitialEntry) {
+      return button.filter(function (item) {
+        return ['submit', 'save'].includes(item);
+      });
+    }
     return button;
-  }, [flowStatus, hasPreNode, flowType, privilege, showShareButton]);
+  }, [flowStatus, hasPreNode, flowType, privilege, showShareButton, isSinglePageInitialEntry]);
   var sliceLen = useMemo(function () {
+    if (isSinglePageInitialEntry) {
+      return 2;
+    }
     return flowType === FlowType.SINGLE_PAGE ? 1 : 3;
-  }, [flowType]);
+  }, [flowType, isSinglePageInitialEntry]);
+  var visibleButtonList = isSinglePageInitialEntry ? buttonList.slice(0, sliceLen) : reverse(buttonList.slice(0, sliceLen));
   var menu = function menu(list) {
     var items = list.map(function (item, index) {
       return {
@@ -128,11 +137,11 @@ var ActionList = function ActionList(props) {
     onClick: function onClick(e) {
       return e.preventDefault();
     }
-  }, /*#__PURE__*/React.createElement(Space, null, "\u66F4\u591A", /*#__PURE__*/React.createElement(DownOutlined, null)))), (_ref = reverse(buttonList.slice(0, sliceLen)) || []) === null || _ref === void 0 ? void 0 : _ref.map(function (button, index) {
+  }, /*#__PURE__*/React.createElement(Space, null, "\u66F4\u591A", /*#__PURE__*/React.createElement(DownOutlined, null)))), visibleButtonList.map(function (button, index) {
     var _buttonMap$button, _buttonMap$button2, _buttonMap$button3, _buttonMap$button4;
     return /*#__PURE__*/React.createElement(Button, {
       key: "button".concat(index),
-      type: buttonMap(flowType)[button].type,
+      type: isSinglePageInitialEntry && button === 'save' ? 'default' : buttonMap(flowType)[button].type,
       onClick: function onClick() {
         return handleAction(button);
       },

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

@@ -48,7 +48,10 @@ var PaymentWorkOrderList = function PaymentWorkOrderList(_ref) {
     return state.workOrder.userInfo.shopList;
   });
   var buyerId = platformInfo.buyerId,
-    platform = platformInfo.platform;
+    platform = platformInfo.platform,
+    otherInfo = platformInfo.otherInfo;
+  var oldBuyerId = otherInfo === null || otherInfo === void 0 ? void 0 : otherInfo.oldBuyerId;
+  var buyerOpenUid = [buyerId, oldBuyerId].filter(Boolean).join(',');
   var _useState = useState(true),
     _useState2 = _slicedToArray(_useState, 2),
     open = _useState2[0],
@@ -70,7 +73,8 @@ var PaymentWorkOrderList = function PaymentWorkOrderList(_ref) {
     form = _Form$useForm2[0];
   useEffect(function () {
     var newSearch = _objectSpread(_objectSpread({}, paySearch), {}, {
-      isBuyer: !!buyerId
+      isBuyer: !!buyerId,
+      buyerOpenUid: buyerOpenUid
     });
     setPaySearch(newSearch);
     setTimeout(function () {
@@ -78,7 +82,7 @@ var PaymentWorkOrderList = function PaymentWorkOrderList(_ref) {
         onSearch(newSearch);
       }
     }, 0); // TODO: 让请求在下一个任务中执行，前一个任务获取不到redux中的数据
-  }, [buyerId]);
+  }, [buyerId, oldBuyerId, buyerOpenUid]);
   var onSearch = function onSearch() {
     var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
     dispatch(fetchQueryPaymentWorkOrderList(params || paySearch));
@@ -123,7 +127,8 @@ var PaymentWorkOrderList = function PaymentWorkOrderList(_ref) {
       workPayStatus: '',
       tid: '',
       paymentMixUk: '',
-      isBuyer: paySearch.isBuyer
+      isBuyer: paySearch.isBuyer,
+      buyerOpenUid: buyerOpenUid
     };
     setPaySearch(newSearch);
     form.setFieldsValue({

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

@@ -71,6 +71,7 @@ var workOrderStatus = [{
 var getTableData = function getTableData(_ref3) {
   var checkedBuyerId = _ref3.checkedBuyerId,
     buyerId = _ref3.buyerId,
+    oldBuyerId = _ref3.oldBuyerId,
     shopList = _ref3.shopList,
     shopId = _ref3.shopId;
   return function (_ref4, formData) {
@@ -89,7 +90,7 @@ var getTableData = function getTableData(_ref3) {
       params.endCreatedTime = time[1] ? moment(time[1]).endOf('day').format('YYYY-MM-DD 23:mm:ss') : undefined;
     }
     if (checkedBuyerId) {
-      params.buyerOpenUid = buyerId;
+      params.buyerOpenUid = [buyerId, oldBuyerId].filter(Boolean).join(',');
     }
     delete params.time; // time是moment类型的，监控上报的时侯，格式化报错了
     var shopUniqueKey = (_ref5 = shopList || []) === null || _ref5 === void 0 ? void 0 : (_ref5$find = _ref5.find(function (item) {
@@ -244,6 +245,7 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref6) {
     shopId = platformInfo.shopId,
     orderNo = platformInfo.orderNo,
     userKey = platformInfo.userKey;
+  var oldBuyerId = otherInfo === null || otherInfo === void 0 ? void 0 : otherInfo.oldBuyerId;
   var templateRef = useRef();
   var searchRef = useRef();
   var _Form$useForm = Form.useForm(),
@@ -265,9 +267,10 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref6) {
   var callBackGetTableData = useCallback(getTableData({
     checkedBuyerId: currentBuyerChecked,
     buyerId: buyerId,
+    oldBuyerId: oldBuyerId,
     shopList: shopList,
     shopId: shopId
-  }), [currentBuyerChecked, buyerId, shopList]);
+  }), [currentBuyerChecked, buyerId, oldBuyerId, shopList, shopId]);
   var _useInfiniteScroll = useInfiniteScroll(function (d) {
       var page = d ? Math.ceil(d.list.length / 10) + 1 : 1;
       return callBackGetTableData({

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

@@ -137,6 +137,8 @@ export var DEFAULT_STRING_COMPONENT_TYPE_FIELD_MAPPING = {
   PAYMENT_VOUCHER_CODE: 'paymentVoucherCode',
   BASIC_MULT_SELECT: 'basicMultSelect',
   ORDER_TYPE: 'erpOrderType',
+  PLATFORM_TRANSIT_FLAG: 'platformTransitFlag',
+  PLATFORM_TRANSIT_TYPE: 'platformTransitType',
   REFUND_TYPE: 'orderRefundType',
   EXECUTE_ACTION_TYPE: 'executeActionType',
   SKX_CREATE_TIME: 'dateTime',

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

@@ -909,6 +909,8 @@ var processComponent = function processComponent(_ref63) {
       case 'PAYMENT_VOUCHER_CODE':
       case 'BASIC_MULT_SELECT':
       case 'ORDER_TYPE':
+      case 'PLATFORM_TRANSIT_FLAG':
+      case 'PLATFORM_TRANSIT_TYPE':
       case 'REFUND_TYPE':
       case 'EXECUTE_ACTION_TYPE':
       case 'SKX_CREATE_TIME':

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

@@ -1616,6 +1616,8 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
       JKY_SYSTEM_ORDER: processErpSystemOrder,
       BUYER_MESSAGE_NOTICE: processBuyerMessageNotice,
       ORDER_TYPE: processOrderType,
+      PLATFORM_TRANSIT_FLAG: processSingleFieldByKey('platformTransitFlag'),
+      PLATFORM_TRANSIT_TYPE: processSingleFieldByKey('platformTransitType'),
       ERP_ORDER_STATUS: processErpOrderStatus,
       JST_OUTBOUND_STATUS: processJstOutboundStatus,
       REFUND_TYPE: processRefundType,

package/dist/esm/model/workOrder.js

@@ -87,12 +87,12 @@ export var fetchQueryGroupCustomTemplate = createAsyncThunk('workOrder/queryGrou
 //获取打款工单列表
 export var fetchQueryPaymentWorkOrderList = createAsyncThunk('workOrder/queryPaymentWorkOrderList', /*#__PURE__*/function () {
   var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(paySearch, action) {
-    var _action$getState, global, _paySearch$tid, tid, _paySearch$paymentMix, paymentMixUk, time, workPayStatus, pageNo, pageSize, isBuyer, params, _yield$queryPaymentWo, data;
+    var _action$getState, global, _paySearch$tid, tid, _paySearch$paymentMix, paymentMixUk, time, workPayStatus, pageNo, pageSize, isBuyer, buyerOpenUid, params, _yield$queryPaymentWo, data;
     return _regeneratorRuntime().wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
           _action$getState = action.getState(), global = _action$getState.global;
-          _paySearch$tid = paySearch.tid, tid = _paySearch$tid === void 0 ? undefined : _paySearch$tid, _paySearch$paymentMix = paySearch.paymentMixUk, paymentMixUk = _paySearch$paymentMix === void 0 ? undefined : _paySearch$paymentMix, time = paySearch.time, workPayStatus = paySearch.workPayStatus, pageNo = paySearch.pageNo, pageSize = paySearch.pageSize, isBuyer = paySearch.isBuyer;
+          _paySearch$tid = paySearch.tid, tid = _paySearch$tid === void 0 ? undefined : _paySearch$tid, _paySearch$paymentMix = paySearch.paymentMixUk, paymentMixUk = _paySearch$paymentMix === void 0 ? undefined : _paySearch$paymentMix, time = paySearch.time, workPayStatus = paySearch.workPayStatus, pageNo = paySearch.pageNo, pageSize = paySearch.pageSize, isBuyer = paySearch.isBuyer, buyerOpenUid = paySearch.buyerOpenUid;
           params = {
             pageNo: pageNo,
             pageSize: pageSize,
@@ -108,7 +108,7 @@ export var fetchQueryPaymentWorkOrderList = createAsyncThunk('workOrder/queryPay
           }
           if (isBuyer) {
             // params.buyerNick = global.platformInfo.buyerNick;
-            params.buyerOpenUid = global.platformInfo.buyerId;
+            params.buyerOpenUid = buyerOpenUid || global.platformInfo.buyerId;
           }
           _context3.next = 10;
           return queryPaymentWorkOrderList(params);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
-  "version": "2.12.1",
+  "version": "2.13.3",
   "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.12.1",
-    "@kmkf-fe-packages/kmkf-utils": "2.12.1",
-    "@kmkf-fe-packages/services-components": "2.12.1",
+    "@kmkf-fe-packages/basic-components": "2.13.3",
+    "@kmkf-fe-packages/kmkf-utils": "2.13.3",
+    "@kmkf-fe-packages/services-components": "2.13.3",
     "@reduxjs/toolkit": "^1.8.5",
     "ahooks": "^3.7.4",
     "copy-to-clipboard": "^3.3.3",
@@ -75,7 +75,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8c77a699e29a220f96f35968e95194a5a9c6e195",
+  "gitHead": "dbc6b21d479eedf23422daedccd4f48eb8560fa3",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }