@kmkf-fe-packages/kmkf-work-order-service-component 2.13.6 → 2.14.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -44,7 +44,7 @@ import { jsonParseSecurity, findComponentUniqueKeyByType, updateComponentToUpper
44
44
  import { NEED_CLEAR_FIELDS_WHEN_SHOP_ID_CHANGE } from "../../constant";
45
45
  import { Context } from "../../context";
46
46
  import { useSelector } from "../../context/useSelector";
47
- import { selectTid } from "../../store/selector";
47
+ import { selectTid, selectOtherInfo } from "../../store/selector";
48
48
  import { orderBackKmAddress } from "./constants";
49
49
  import { onBlurExpressLogisticsCode, onBlurErpAfterSaleTradeId, onBlurSkxOutboundNoticeNo, onBlurSkxReturnBillNo, onBlurSkxLogisticsCode, onBlurSkxReturnTHLogisticsCode, onBlurReturnLogisticsCode } from "./onBlur";
50
50
  import { findAllDependencies } from "./component-dependency-finder";
@@ -64,6 +64,7 @@ var FormRender = function FormRender(props, ref) {
64
64
  var _useContext = useContext(Context),
65
65
  dispatch = _useContext.dispatch;
66
66
  var storeTid = useSelector(selectTid);
67
+ var otherInfo = useSelector(selectOtherInfo);
67
68
  var setLoading = function setLoading(flag) {
68
69
  dispatch({
69
70
  type: 'setOrderBackLoading',
@@ -573,6 +574,7 @@ var FormRender = function FormRender(props, ref) {
573
574
  callback: orderBackReplace,
574
575
  fromQNCreateWorkOrderByOrderNo: fromQNCreateWorkOrderByOrderNo,
575
576
  plat: plat,
577
+ otherInfo: otherInfo,
576
578
  callKey: 1,
577
579
  setLoading: setLoading,
578
580
  skipCache: autoSubmit,
@@ -724,6 +726,7 @@ var FormRender = function FormRender(props, ref) {
724
726
  fromQNCreateWorkOrderByOrderNo: fromQNCreateWorkOrderByOrderNo,
725
727
  // TODO: 只有在千牛端通过订单号录入工单的时候,订单备注不需要反填
726
728
  plat: plat,
729
+ otherInfo: otherInfo,
727
730
  callKey: 2,
728
731
  setLoading: setLoading,
729
732
  skipCache: autoSubmit
@@ -1022,6 +1025,7 @@ var FormRender = function FormRender(props, ref) {
1022
1025
  callback: orderBackReplace,
1023
1026
  fromQNCreateWorkOrderByOrderNo: false,
1024
1027
  plat: plat,
1028
+ otherInfo: otherInfo,
1025
1029
  callbackShopId: function callbackShopId(id) {
1026
1030
  setIsOrderBackShopId(true);
1027
1031
  setTimeout(function () {
@@ -1497,6 +1501,7 @@ var FormRender = function FormRender(props, ref) {
1497
1501
  callback: orderBackReplace,
1498
1502
  fromQNCreateWorkOrderByOrderNo: false,
1499
1503
  plat: plat,
1504
+ otherInfo: otherInfo,
1500
1505
  callbackShopId: function callbackShopId(id) {
1501
1506
  setIsOrderBackShopId(true);
1502
1507
  setTimeout(function () {
@@ -1251,7 +1251,11 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
1251
1251
  type: 'setPrivilege',
1252
1252
  payload: privilege
1253
1253
  });
1254
- }, [plat, privilege]);
1254
+ dispatch({
1255
+ type: 'setOtherInfo',
1256
+ payload: otherInfo
1257
+ });
1258
+ }, [plat, privilege, otherInfo]);
1255
1259
  var autoSubmitFn = function autoSubmitFn() {
1256
1260
  var _currentNodeDetail$wo24;
1257
1261
  // TODO: 兼容后端一些时候生成的数据异常情况,防止批量提交出现卡顿不执行情况
@@ -26,6 +26,7 @@ export declare const setCurrentNode: (state: FlowTemplateDetailState, { payload
26
26
  export declare const setAction: (state: FlowTemplateDetailState, { payload }: PayloadAction<ActionType>) => void;
27
27
  export declare const setVisibleRemarkList: (state: FlowTemplateDetailState, { payload }: PayloadAction<boolean>) => void;
28
28
  export declare const setPlat: (state: FlowTemplateDetailState, { payload }: PayloadAction<PlatFormInfo>) => void;
29
+ export declare const setOtherInfo: (state: FlowTemplateDetailState, { payload }: PayloadAction<Record<string, any>>) => void;
29
30
  export declare const setOperateParams: (state: FlowTemplateDetailState, { payload }: PayloadAction<any>) => void;
30
31
  export declare const setAddRemarkVisible: (state: FlowTemplateDetailState, { payload }: PayloadAction<boolean>) => void;
31
32
  export declare const setFlowStatus: (state: FlowTemplateDetailState, { payload }: PayloadAction<FlowStatus>) => void;
@@ -68,6 +69,7 @@ declare const reducers: (state: FlowTemplateDetailState | undefined, action: {
68
69
  action: ActionType;
69
70
  visibleRemarkList: boolean;
70
71
  plat: PlatFormInfo;
72
+ otherInfo?: Record<string, any> | undefined;
71
73
  operateParams?: {
72
74
  flowTemplateKey: string;
73
75
  flowVersion: number;
@@ -525,79 +525,83 @@ export var setPlat = function setPlat(state, _ref19) {
525
525
  var payload = _ref19.payload;
526
526
  state.plat = payload;
527
527
  };
528
- export var setOperateParams = function setOperateParams(state, _ref20) {
528
+ export var setOtherInfo = function setOtherInfo(state, _ref20) {
529
529
  var payload = _ref20.payload;
530
- state.operateParams = payload;
530
+ state.otherInfo = payload;
531
531
  };
532
- export var setAddRemarkVisible = function setAddRemarkVisible(state, _ref21) {
532
+ export var setOperateParams = function setOperateParams(state, _ref21) {
533
533
  var payload = _ref21.payload;
534
- state.addRemarkVisible = payload;
534
+ state.operateParams = payload;
535
535
  };
536
- export var setFlowStatus = function setFlowStatus(state, _ref22) {
536
+ export var setAddRemarkVisible = function setAddRemarkVisible(state, _ref22) {
537
537
  var payload = _ref22.payload;
538
- state.flowStatus = payload;
538
+ state.addRemarkVisible = payload;
539
539
  };
540
- export var setFlowTemplateId = function setFlowTemplateId(state, _ref23) {
540
+ export var setFlowStatus = function setFlowStatus(state, _ref23) {
541
541
  var payload = _ref23.payload;
542
- state.flowTemplateId = payload;
542
+ state.flowStatus = payload;
543
543
  };
544
- export var setCurrentTradeIdWOrkOrderNumber = function setCurrentTradeIdWOrkOrderNumber(state, _ref24) {
544
+ export var setFlowTemplateId = function setFlowTemplateId(state, _ref24) {
545
545
  var payload = _ref24.payload;
546
- state.currentTradeIdLinkWorkOrder = payload;
546
+ state.flowTemplateId = payload;
547
547
  };
548
- export var setCurrentFlowAllShowHideRules = function setCurrentFlowAllShowHideRules(state, _ref25) {
548
+ export var setCurrentTradeIdWOrkOrderNumber = function setCurrentTradeIdWOrkOrderNumber(state, _ref25) {
549
549
  var payload = _ref25.payload;
550
- state.currentFlowAllShowHideRules = payload;
550
+ state.currentTradeIdLinkWorkOrder = payload;
551
551
  };
552
- export var setWithdrawWorkOrderDetail = function setWithdrawWorkOrderDetail(state, _ref26) {
552
+ export var setCurrentFlowAllShowHideRules = function setCurrentFlowAllShowHideRules(state, _ref26) {
553
553
  var payload = _ref26.payload;
554
+ state.currentFlowAllShowHideRules = payload;
555
+ };
556
+ export var setWithdrawWorkOrderDetail = function setWithdrawWorkOrderDetail(state, _ref27) {
557
+ var payload = _ref27.payload;
554
558
  state.withdrawWorkOrderDetail = payload;
555
559
  };
556
- export var setClearStore = function setClearStore(state, _ref27) {
560
+ export var setClearStore = function setClearStore(state, _ref28) {
557
561
  var _Object$keys;
558
- var payload = _ref27.payload;
562
+ var payload = _ref28.payload;
559
563
  (_Object$keys = Object.keys(initState)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.map(function (key) {
560
564
  // @ts-ignore
561
565
  state[key] = initState[key];
562
566
  });
563
567
  };
564
- export var setFlowTemplateType = function setFlowTemplateType(state, _ref28) {
565
- var payload = _ref28.payload;
568
+ export var setFlowTemplateType = function setFlowTemplateType(state, _ref29) {
569
+ var payload = _ref29.payload;
566
570
  state.flowTemplateType = payload;
567
571
  };
568
- export var setLabelList = function setLabelList(state, _ref29) {
569
- var payload = _ref29.payload;
572
+ export var setLabelList = function setLabelList(state, _ref30) {
573
+ var payload = _ref30.payload;
570
574
  state.labelList = payload;
571
575
  };
572
576
  export var clearLabelList = function clearLabelList(state) {
573
577
  state.labelList = [];
574
578
  };
575
- export var setRejectLoading = function setRejectLoading(state, _ref30) {
576
- var payload = _ref30.payload;
579
+ export var setRejectLoading = function setRejectLoading(state, _ref31) {
580
+ var payload = _ref31.payload;
577
581
  state.rejectLoading = payload;
578
582
  };
579
- export var setWithDrawLoading = function setWithDrawLoading(state, _ref31) {
580
- var payload = _ref31.payload;
583
+ export var setWithDrawLoading = function setWithDrawLoading(state, _ref32) {
584
+ var payload = _ref32.payload;
581
585
  state.withdrawLoading = payload;
582
586
  };
583
- export var setFollow = function setFollow(state, _ref32) {
584
- var payload = _ref32.payload;
587
+ export var setFollow = function setFollow(state, _ref33) {
588
+ var payload = _ref33.payload;
585
589
  state.follow = payload;
586
590
  };
587
- export var setaAutoSubmitFlag = function setaAutoSubmitFlag(state, _ref33) {
588
- var payload = _ref33.payload;
591
+ export var setaAutoSubmitFlag = function setaAutoSubmitFlag(state, _ref34) {
592
+ var payload = _ref34.payload;
589
593
  state.autoSubmitFlag = payload;
590
594
  };
591
- export var setPrivilege = function setPrivilege(state, _ref34) {
592
- var payload = _ref34.payload;
595
+ export var setPrivilege = function setPrivilege(state, _ref35) {
596
+ var payload = _ref35.payload;
593
597
  state.privilege = payload;
594
598
  };
595
- export var setShowShareButton = function setShowShareButton(state, _ref35) {
596
- var payload = _ref35.payload;
599
+ export var setShowShareButton = function setShowShareButton(state, _ref36) {
600
+ var payload = _ref36.payload;
597
601
  state.showShareButton = payload;
598
602
  };
599
- export var setH5SharePermission = function setH5SharePermission(state, _ref36) {
600
- var payload = _ref36.payload;
603
+ export var setH5SharePermission = function setH5SharePermission(state, _ref37) {
604
+ var payload = _ref37.payload;
601
605
  state.hasH5SharePermission = payload;
602
606
  };
603
607
  var reducerMap = {
@@ -614,6 +618,7 @@ var reducerMap = {
614
618
  setAction: setAction,
615
619
  setVisibleRemarkList: setVisibleRemarkList,
616
620
  setPlat: setPlat,
621
+ setOtherInfo: setOtherInfo,
617
622
  setOperateParams: setOperateParams,
618
623
  setAddRemarkVisible: setAddRemarkVisible,
619
624
  setFlowStatus: setFlowStatus,
@@ -245,6 +245,7 @@ export declare const selectShopUniqueKey: (state: FlowTemplateDetailState) => st
245
245
  export declare const selectCurrentAction: (state: FlowTemplateDetailState) => import("../../model/flowTemplateDetail/types").ActionType;
246
246
  export declare const selectVisibleRemarkList: (state: FlowTemplateDetailState) => boolean;
247
247
  export declare const selectPlatInfo: (state: FlowTemplateDetailState) => import("../../model/flowTemplateDetail/types").PlatFormInfo;
248
+ export declare const selectOtherInfo: (state: FlowTemplateDetailState) => Record<string, any> | undefined;
248
249
  export declare const selectOperateParams: (state: FlowTemplateDetailState) => {
249
250
  flowTemplateKey: string;
250
251
  flowVersion: number;
@@ -29,6 +29,9 @@ export var selectVisibleRemarkList = function selectVisibleRemarkList(state) {
29
29
  export var selectPlatInfo = function selectPlatInfo(state) {
30
30
  return state.plat;
31
31
  };
32
+ export var selectOtherInfo = function selectOtherInfo(state) {
33
+ return state.otherInfo;
34
+ };
32
35
  export var selectOperateParams = function selectOperateParams(state) {
33
36
  return state.operateParams;
34
37
  };
@@ -237,7 +237,7 @@ var WorkOrder = function WorkOrder(props) {
237
237
  })) === null || _find === void 0 ? void 0 : _find.uniqueKey;
238
238
  }, [shopList, shopId]);
239
239
  var RenderInfo = function RenderInfo() {
240
- var _userInfo$quotaInfo, _userInfo$quotaInfo2, _userInfo$quotaInfo3, _userInfo$quotaInfo4, _userInfo$quotaInfo5, _userInfo$quotaInfo6, _userInfo$quotaInfo7, _userInfo$quotaInfo8, _userInfo$quotaInfo9, _userInfo$quotaInfo10, _userInfo$quotaInfo11, _userInfo$quotaInfo12, _userInfo$quotaInfo13;
240
+ var _userInfo$quotaInfo, _userInfo$quotaInfo2, _userInfo$quotaInfo3, _userInfo$quotaInfo4, _userInfo$quotaInfo5, _userInfo$quotaInfo6, _userInfo$quotaInfo7, _userInfo$quotaInfo8, _userInfo$quotaInfo9, _userInfo$quotaInfo10, _userInfo$quotaInfo11, _userInfo$quotaInfo12, _userInfo$quotaInfo13, _userInfo$quotaInfo14, _userInfo$quotaInfo15;
241
241
  var loginOutHandle = function loginOutHandle() {
242
242
  setVisible(false);
243
243
  Modal.confirm({
@@ -291,15 +291,15 @@ var WorkOrder = function WorkOrder(props) {
291
291
  className: "infoBox"
292
292
  }, "\u5E97\u94FA\u6570:", /*#__PURE__*/React.createElement("span", {
293
293
  className: "infoColor"
294
- }, "\u5DF2\u7528\uFF1A", "".concat((userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$quotaInfo5 = userInfo.quotaInfo) === null || _userInfo$quotaInfo5 === void 0 ? void 0 : _userInfo$quotaInfo5.shopUsed) || 0, "/").concat((userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$quotaInfo6 = userInfo.quotaInfo) === null || _userInfo$quotaInfo6 === void 0 ? void 0 : _userInfo$quotaInfo6.shopTotal) || 0), ", \u5269\u4F59\uFF1A", "".concat((userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$quotaInfo7 = userInfo.quotaInfo) === null || _userInfo$quotaInfo7 === void 0 ? void 0 : _userInfo$quotaInfo7.shopRemain) || 0))), /*#__PURE__*/React.createElement("div", {
294
+ }, (userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$quotaInfo5 = userInfo.quotaInfo) === null || _userInfo$quotaInfo5 === void 0 ? void 0 : _userInfo$quotaInfo5.shopTotal) === -1 ? '不限量' : "\u5DF2\u7528\uFF1A".concat((userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$quotaInfo6 = userInfo.quotaInfo) === null || _userInfo$quotaInfo6 === void 0 ? void 0 : _userInfo$quotaInfo6.shopUsed) || 0, "/").concat((userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$quotaInfo7 = userInfo.quotaInfo) === null || _userInfo$quotaInfo7 === void 0 ? void 0 : _userInfo$quotaInfo7.shopTotal) || 0, ", \u5269\u4F59\uFF1A").concat((userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$quotaInfo8 = userInfo.quotaInfo) === null || _userInfo$quotaInfo8 === void 0 ? void 0 : _userInfo$quotaInfo8.shopRemain) || 0))), /*#__PURE__*/React.createElement("div", {
295
295
  className: "infoBox"
296
296
  }, "\u8D26\u53F7\u6570:", /*#__PURE__*/React.createElement("span", {
297
297
  className: "infoColor"
298
- }, "\u5DF2\u7528\uFF1A", "".concat((userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$quotaInfo8 = userInfo.quotaInfo) === null || _userInfo$quotaInfo8 === void 0 ? void 0 : _userInfo$quotaInfo8.userUsed) || 0, "/").concat((userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$quotaInfo9 = userInfo.quotaInfo) === null || _userInfo$quotaInfo9 === void 0 ? void 0 : _userInfo$quotaInfo9.userTotal) || 0), ", \u5269\u4F59\uFF1A", "".concat((userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$quotaInfo10 = userInfo.quotaInfo) === null || _userInfo$quotaInfo10 === void 0 ? void 0 : _userInfo$quotaInfo10.userRemain) || 0))), /*#__PURE__*/React.createElement("div", {
298
+ }, (userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$quotaInfo9 = userInfo.quotaInfo) === null || _userInfo$quotaInfo9 === void 0 ? void 0 : _userInfo$quotaInfo9.userTotal) === -1 ? '不限量' : "\u5DF2\u7528\uFF1A".concat((userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$quotaInfo10 = userInfo.quotaInfo) === null || _userInfo$quotaInfo10 === void 0 ? void 0 : _userInfo$quotaInfo10.userUsed) || 0, "/").concat((userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$quotaInfo11 = userInfo.quotaInfo) === null || _userInfo$quotaInfo11 === void 0 ? void 0 : _userInfo$quotaInfo11.userTotal) || 0, ", \u5269\u4F59\uFF1A").concat((userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$quotaInfo12 = userInfo.quotaInfo) === null || _userInfo$quotaInfo12 === void 0 ? void 0 : _userInfo$quotaInfo12.userRemain) || 0))), /*#__PURE__*/React.createElement("div", {
299
299
  className: "infoBox"
300
300
  }, "RPA\u673A\u5668\u4EBA\u6570:", /*#__PURE__*/React.createElement("span", {
301
301
  className: "infoColor"
302
- }, "\u5DF2\u7528\uFF1A", "".concat((userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$quotaInfo11 = userInfo.quotaInfo) === null || _userInfo$quotaInfo11 === void 0 ? void 0 : _userInfo$quotaInfo11.rpaUsed) || 0, "/").concat((userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$quotaInfo12 = userInfo.quotaInfo) === null || _userInfo$quotaInfo12 === void 0 ? void 0 : _userInfo$quotaInfo12.rpaTotal) || 0), ", \u5269\u4F59\uFF1A", "".concat((userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$quotaInfo13 = userInfo.quotaInfo) === null || _userInfo$quotaInfo13 === void 0 ? void 0 : _userInfo$quotaInfo13.rpaRemain) || 0))), /*#__PURE__*/React.createElement("div", {
302
+ }, "\u5DF2\u7528\uFF1A", "".concat((userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$quotaInfo13 = userInfo.quotaInfo) === null || _userInfo$quotaInfo13 === void 0 ? void 0 : _userInfo$quotaInfo13.rpaUsed) || 0, "/").concat((userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$quotaInfo14 = userInfo.quotaInfo) === null || _userInfo$quotaInfo14 === void 0 ? void 0 : _userInfo$quotaInfo14.rpaTotal) || 0), ", \u5269\u4F59\uFF1A", "".concat((userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$quotaInfo15 = userInfo.quotaInfo) === null || _userInfo$quotaInfo15 === void 0 ? void 0 : _userInfo$quotaInfo15.rpaRemain) || 0))), /*#__PURE__*/React.createElement("div", {
303
303
  className: "loginOut infoBox",
304
304
  onClick: loginOutHandle
305
305
  }, /*#__PURE__*/React.createElement(LogoutOutlined, null), "\u9000\u51FA\u767B\u5F55"));
@@ -40,7 +40,7 @@ export declare const calcWorkOrderList: (source: Partial<WorkOrderDetail>[], tem
40
40
  workOrderComponentType: string;
41
41
  uniqueKey: string;
42
42
  }[], type?: string) => any[];
43
- export declare const orderBack: ({ companyKey, order_no, form, shopId: propsShopid, shopList, templateDetail, type, callback, fromQNCreateWorkOrderByOrderNo, plat, callbackShopId, setLoading, callKey, matchLogisticsNo, skipCache, skipOrderBackUniqueKeys, }: any) => Promise<void>;
43
+ export declare const orderBack: ({ companyKey, order_no, form, shopId: propsShopid, shopList, templateDetail, type, callback, fromQNCreateWorkOrderByOrderNo, plat, otherInfo, callbackShopId, setLoading, callKey, matchLogisticsNo, skipCache, skipOrderBackUniqueKeys, }: any) => Promise<void>;
44
44
  export declare const imgResize: (url: string, w?: number, h?: number) => string;
45
45
  export declare const COMPONENT_MAP: {
46
46
  [key: string]: string;
@@ -146,11 +146,11 @@ var getBasicsOrderInfo = function getBasicsOrderInfo(orderInfo, xiaozhiOrder) {
146
146
  export var orderBack = /*#__PURE__*/function () {
147
147
  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
148
148
  var _form$getFieldValue;
149
- var companyKey, order_no, form, propsShopid, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, callbackShopId, setLoading, callKey, matchLogisticsNo, skipCache, skipOrderBackUniqueKeys, shopId, canModifyShopFieldValue, shouldTryAutoSetShopId, trySetShopId, _res$data, res, _res$data2, _res$data3, JOIN_SHOP, hasFlagMap, _ref4, shopSourceStr, _ref4$thirdUserNick, thirdUserNick, thirdShopMainType, _kmVideoComponent$com, _wdtReturnBillNoCompo, _data$value, _data$value3, _data$value4, _jstOrder$value, _jstOrder$value2, _bsOrder$value, _wlnOrder$value, _wdtOrder$value, _bsE3Order$value, _kmOrder$value, _gyOrder$value, _jyOrder$value, _skxOrder$value, _skxReturnOrder$value, _jkyOrder$value, _wdtReturnOrder$value, _dxdOrder$value, _ttxOrder$value, _bsOrders$orders, _bsE3Orders$orderList, _wlnOrders$orders, _wdtOrders$trades, _wdtInfo$wdtSystemOrd, _wdtInfo$wdtSystemOrd2, _gyOrders$trades, _jyOrders$trades, _jkyOrders$trades, _kmOrders$orderDetail, _kmInfo$kmSystemOrder, _kmInfo$kmSystemOrder2, _dxdOrders$doOrders, _dxdInfo$dxdSystemOrd, _dxdInfo$dxdSystemOrd2, _ttxInfo$ttxSystemOrd, _ttxInfo$ttxSystemOrd2, _ttxInfo$ttxSystemOrd3, _ttxInfo$ttxSystemOrd4, _value$selectIds, _value$showOrderInfo, _afterSalesOrderField, _afterSaleOrders$valu, promise, kmVideoComponent, OrderSubFormComponent, wdtReturnBillNoComponent, _yield$Promise$allSet, _yield$Promise$allSet2, data, afterSaleOrders, xiaozhiOrder, jstOrder, bsOrder, wlnOrder, wdtOrder, bsE3Order, kmOrder, gyOrder, jyOrder, skxOrder, skxReturnOrder, jkyOrder, dxdOrder, ttxOrder, kmVideoOrder, orderSubFormOrder, wdtReturnOrder, _data$value2, orderInfo, jstOrders, bsOrders, wlnOrders, wdtOrders, bsE3Orders, kmOrders, gyOrders, jyOrders, skxOrders, skxReturnOrders, jkyOrders, wdtReturnOrders, dxdOrders, ttxOrders, bsInfo, wlnInfo, bsE3Info, wdtInfo, kmInfo, orderSubFormInfo, gyInfo, jyInfo, jkyInfo, jstInfo, skxInfo, skxReturnInfo, dxdInfo, ttxInfo, formValue, afterSalesOrderField, value, afterSalesOrderSelectOrder, isAfterSalesOrderMultiple, afterSaleOrderInfo, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, hasSigningDatetime, _signDatetime$data, signDatetime, values, paymentUniqueKey;
149
+ var companyKey, order_no, form, propsShopid, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, otherInfo, callbackShopId, setLoading, callKey, matchLogisticsNo, skipCache, skipOrderBackUniqueKeys, shopId, canModifyShopFieldValue, shouldTryAutoSetShopId, trySetShopId, _res$data, res, _res$data2, _res$data3, JOIN_SHOP, hasFlagMap, _ref4, shopSourceStr, _ref4$thirdUserNick, thirdUserNick, thirdShopMainType, _kmVideoComponent$com, _wdtReturnBillNoCompo, _data$value, _data$value3, _data$value4, _jstOrder$value, _jstOrder$value2, _bsOrder$value, _wlnOrder$value, _wdtOrder$value, _bsE3Order$value, _kmOrder$value, _gyOrder$value, _jyOrder$value, _skxOrder$value, _skxReturnOrder$value, _jkyOrder$value, _wdtReturnOrder$value, _dxdOrder$value, _ttxOrder$value, _bsOrders$orders, _bsE3Orders$orderList, _wlnOrders$orders, _wdtOrders$trades, _wdtInfo$wdtSystemOrd, _wdtInfo$wdtSystemOrd2, _gyOrders$trades, _jyOrders$trades, _jkyOrders$trades, _kmOrders$orderDetail, _kmInfo$kmSystemOrder, _kmInfo$kmSystemOrder2, _dxdOrders$doOrders, _dxdInfo$dxdSystemOrd, _dxdInfo$dxdSystemOrd2, _ttxInfo$ttxSystemOrd, _ttxInfo$ttxSystemOrd2, _ttxInfo$ttxSystemOrd3, _ttxInfo$ttxSystemOrd4, _value$selectIds, _value$showOrderInfo, _afterSalesOrderField, _afterSaleOrders$valu, promise, kmVideoComponent, OrderSubFormComponent, wdtReturnBillNoComponent, _yield$Promise$allSet, _yield$Promise$allSet2, data, afterSaleOrders, xiaozhiOrder, jstOrder, bsOrder, wlnOrder, wdtOrder, bsE3Order, kmOrder, gyOrder, jyOrder, skxOrder, skxReturnOrder, jkyOrder, dxdOrder, ttxOrder, kmVideoOrder, orderSubFormOrder, wdtReturnOrder, _data$value2, orderInfo, jstOrders, bsOrders, wlnOrders, wdtOrders, bsE3Orders, kmOrders, gyOrders, jyOrders, skxOrders, skxReturnOrders, jkyOrders, wdtReturnOrders, dxdOrders, ttxOrders, bsInfo, wlnInfo, bsE3Info, wdtInfo, kmInfo, orderSubFormInfo, gyInfo, jyInfo, jkyInfo, jstInfo, skxInfo, skxReturnInfo, dxdInfo, ttxInfo, formValue, afterSalesOrderField, value, afterSalesOrderSelectOrder, isAfterSalesOrderMultiple, afterSaleOrderInfo, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, hasSigningDatetime, _signDatetime$data, signDatetime, values, paymentUniqueKey;
150
150
  return _regeneratorRuntime().wrap(function _callee$(_context) {
151
151
  while (1) switch (_context.prev = _context.next) {
152
152
  case 0:
153
- companyKey = _ref.companyKey, order_no = _ref.order_no, form = _ref.form, propsShopid = _ref.shopId, shopList = _ref.shopList, templateDetail = _ref.templateDetail, _ref$type = _ref.type, type = _ref$type === void 0 ? 'add' : _ref$type, callback = _ref.callback, fromQNCreateWorkOrderByOrderNo = _ref.fromQNCreateWorkOrderByOrderNo, _ref$plat = _ref.plat, plat = _ref$plat === void 0 ? {} : _ref$plat, callbackShopId = _ref.callbackShopId, setLoading = _ref.setLoading, callKey = _ref.callKey, matchLogisticsNo = _ref.matchLogisticsNo, skipCache = _ref.skipCache, skipOrderBackUniqueKeys = _ref.skipOrderBackUniqueKeys;
153
+ companyKey = _ref.companyKey, 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, otherInfo = _ref.otherInfo, callbackShopId = _ref.callbackShopId, setLoading = _ref.setLoading, callKey = _ref.callKey, matchLogisticsNo = _ref.matchLogisticsNo, skipCache = _ref.skipCache, skipOrderBackUniqueKeys = _ref.skipOrderBackUniqueKeys;
154
154
  console.log('orderBack-run--', callKey, templateDetail);
155
155
  shopId = propsShopid;
156
156
  canModifyShopFieldValue = form === null || form === void 0 ? void 0 : (_form$getFieldValue = form.getFieldValue) === null || _form$getFieldValue === void 0 ? void 0 : _form$getFieldValue.call(form, FIXED_FIELD_CAN_MODIFY_SHOP);
@@ -379,8 +379,8 @@ export var orderBack = /*#__PURE__*/function () {
379
379
  if (data !== null && data !== void 0 && (_data$value = data.value) !== null && _data$value !== void 0 && _data$value.message) {
380
380
  message.warning(data === null || data === void 0 ? void 0 : (_data$value2 = data.value) === null || _data$value2 === void 0 ? void 0 : _data$value2.message);
381
381
  }
382
- orderInfo = ((data === null || data === void 0 ? void 0 : (_data$value3 = data.value) === null || _data$value3 === void 0 ? void 0 : _data$value3.data) || (xiaozhiOrder === null || xiaozhiOrder === void 0 ? void 0 : xiaozhiOrder.value)) && getBasicsOrderInfo(data === null || data === void 0 ? void 0 : (_data$value4 = data.value) === null || _data$value4 === void 0 ? void 0 : _data$value4.data, xiaozhiOrder === null || xiaozhiOrder === void 0 ? void 0 : xiaozhiOrder.value); //千牛端优先获取端上买家昵称
383
- if ([PlatForm.TB].includes(plat.platform) && orderInfo) {
382
+ orderInfo = ((data === null || data === void 0 ? void 0 : (_data$value3 = data.value) === null || _data$value3 === void 0 ? void 0 : _data$value3.data) || (xiaozhiOrder === null || xiaozhiOrder === void 0 ? void 0 : xiaozhiOrder.value)) && getBasicsOrderInfo(data === null || data === void 0 ? void 0 : (_data$value4 = data.value) === null || _data$value4 === void 0 ? void 0 : _data$value4.data, xiaozhiOrder === null || xiaozhiOrder === void 0 ? void 0 : xiaozhiOrder.value); //千牛端/京东/小智客户端jd优先获取端上买家昵称
383
+ if (orderInfo && ([PlatForm.TB, PlatForm.JD].includes(plat.platform) || plat.platform === PlatForm.XIAOZHI && String(otherInfo === null || otherInfo === void 0 ? void 0 : otherInfo.xzClientPlatformType) === '2')) {
384
384
  orderInfo.buyerNick = (plat === null || plat === void 0 ? void 0 : plat.buyerNick) || (orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.buyerNick);
385
385
  }
386
386
  jstOrders = (jstOrder === null || jstOrder === void 0 ? void 0 : (_jstOrder$value = jstOrder.value) === null || _jstOrder$value === void 0 ? void 0 : _jstOrder$value.data) && {
@@ -53,6 +53,7 @@ export interface FlowTemplateDetailState {
53
53
  action: ActionType;
54
54
  visibleRemarkList: boolean;
55
55
  plat: PlatFormInfo;
56
+ otherInfo?: Record<string, any>;
56
57
  operateParams?: {
57
58
  flowTemplateKey: string;
58
59
  flowVersion: number;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
3
- "version": "2.13.6",
3
+ "version": "2.14.5",
4
4
  "module": "dist/esm/index.js",
5
5
  "typings": "dist/esm/index.d.ts",
6
6
  "files": [
@@ -32,9 +32,9 @@
32
32
  },
33
33
  "dependencies": {
34
34
  "@ant-design/icons": "^4.7.0",
35
- "@kmkf-fe-packages/basic-components": "2.13.6",
36
- "@kmkf-fe-packages/kmkf-utils": "2.13.6",
37
- "@kmkf-fe-packages/services-components": "2.13.6",
35
+ "@kmkf-fe-packages/basic-components": "2.14.5",
36
+ "@kmkf-fe-packages/kmkf-utils": "2.14.5",
37
+ "@kmkf-fe-packages/services-components": "2.14.5",
38
38
  "@reduxjs/toolkit": "^1.8.5",
39
39
  "ahooks": "^3.7.4",
40
40
  "copy-to-clipboard": "^3.3.3",
@@ -75,7 +75,7 @@
75
75
  "publishConfig": {
76
76
  "access": "public"
77
77
  },
78
- "gitHead": "30ff6266c6ad6422165a327edb09c9261ed2cfa7",
78
+ "gitHead": "2c624bb991f3e6fc32e567c8c2cb7ebab371a6d7",
79
79
  "gitHooks": {
80
80
  "pre-commit": "lint-staged"
81
81
  }