@kmkf-fe-packages/kmkf-work-order-service-component 2.0.63 → 2.0.64

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.
Files changed (46) hide show
  1. package/dist/esm/FlowTemplateDetailV2/components/FormRender/index.js +140 -47
  2. package/dist/esm/FlowTemplateDetailV2/constant.js +1 -1
  3. package/dist/esm/common/utils/constant.js +4 -0
  4. package/dist/esm/common/utils/submitDataTransOldFormat.js +2 -1
  5. package/dist/esm/common/utils/tools.js +9 -1
  6. package/dist/esm/common/utils/tools_constants.js +1 -1
  7. package/dist/esm/common/utils/transformWorkOrderData.js +34 -6
  8. package/dist/esm/model/logicFlow/selector.d.ts +3 -0
  9. package/dist/esm/model/paymentWorkOrder/selector.d.ts +9 -0
  10. package/dist/esm/model/servers/api.d.ts +1 -0
  11. package/dist/esm/model/servers/api.js +8 -0
  12. package/dist/esm/model/singleShopWorkOrder/selector.d.ts +5 -0
  13. package/package.json +5 -5
  14. package/dist/esm/GlobalContext/hook/dist/useGetHasErpData.js +0 -52
  15. package/dist/esm/GlobalContext/orderQuery/dist/useGetErpAddressData.js +0 -180
  16. package/dist/esm/GlobalContext/orderQuery/dist/useGetErpLogisticsCompany.js +0 -186
  17. package/dist/esm/common/utils/dist/submitDataTransOldFormat.js +0 -899
  18. package/dist/esm/common/utils/dist/tools.js +0 -1326
  19. package/dist/esm/common/utils/dist/transformWorkOrderData.js +0 -965
  20. package/dist/esm/model/customizeWorkOrder/dist/api.js +0 -48
  21. package/dist/esm/model/customizeWorkOrder/dist/index.js +0 -370
  22. package/dist/esm/model/customizeWorkOrder/dist/selector.js +0 -63
  23. package/dist/esm/model/customizeWorkOrder/dist/types.js +0 -3
  24. package/dist/esm/model/dist/global.js +0 -44
  25. package/dist/esm/model/dist/hooks.js +0 -15
  26. package/dist/esm/model/dist/login.js +0 -245
  27. package/dist/esm/model/dist/store.js +0 -30
  28. package/dist/esm/model/dist/userData.js +0 -41
  29. package/dist/esm/model/dist/workOrder.js +0 -329
  30. package/dist/esm/model/flowTemplateDetail/dist/api.js +0 -192
  31. package/dist/esm/model/flowTemplateDetail/dist/types.js +0 -48
  32. package/dist/esm/model/logicFlow/dist/api.js +0 -14
  33. package/dist/esm/model/logicFlow/dist/index.js +0 -235
  34. package/dist/esm/model/logicFlow/dist/selector.js +0 -18
  35. package/dist/esm/model/logicFlow/dist/types.js +0 -3
  36. package/dist/esm/model/paymentWorkOrder/dist/index.js +0 -77
  37. package/dist/esm/model/paymentWorkOrder/dist/selector.js +0 -36
  38. package/dist/esm/model/paymentWorkOrder/dist/types.js +0 -3
  39. package/dist/esm/model/servers/dist/api.js +0 -545
  40. package/dist/esm/model/servers/dist/request.js +0 -63
  41. package/dist/esm/model/singleShopWorkOrder/dist/index.js +0 -216
  42. package/dist/esm/model/singleShopWorkOrder/dist/selector.js +0 -24
  43. package/dist/esm/model/singleShopWorkOrder/dist/types.js +0 -3
  44. package/dist/esm/model/types/dist/login.js +0 -3
  45. package/dist/esm/model/types/dist/singleWorkOrder.js +0 -3
  46. package/dist/esm/model/types/dist/workOrder.js +0 -3
@@ -30,7 +30,7 @@ import 'moment/locale/zh-cn';
30
30
  import { calcWorkOrderList, orderBack, getReplaceWarnValues, COMPONENT_MAP_NAME, EXCLUDE_REPLACE_TOP_COMPONENT,
31
31
  // 重复检验不需要展示在顶部的
32
32
  INNER_REPLACE_COMPONENT, reversalFormValues, bsSystemOrderBackValues, kmSystemOrderBackValues, bsE3SystemOrderBackValues, wlnSystemOrderBackValues, gySystemOrderBackValues, jstSystemOrderBackValues, getMappingConfigByTemplateDetail, wdtSystemOrderBackValues, setLogisticsInfo, getMappingTargetValue } from "../../../common/utils/tools";
33
- import { replaceCheck, orderDetail, queryLabelByTradeId, queryMemberLevel } from "../../../model/servers/api";
33
+ import { replaceCheck, orderDetail, queryLabelByTradeId, queryMemberLevel, queryTidByOutSid } from "../../../model/servers/api";
34
34
  import { factory } from '@kmkf-fe-packages/services-components';
35
35
  import { getExpression, formatDisplayConfig, isNull, LabelData, setSessionStorage } from '@kmkf-fe-packages/kmkf-utils';
36
36
  import ShopName from "../ShopName";
@@ -704,32 +704,51 @@ var FormRender = function FormRender(props, ref) {
704
704
  }();
705
705
 
706
706
  //订单返填
707
- var changeHandle = function changeHandle(order_no) {
708
- if (!order_no) return;
709
- // console.log('[订单返填 changeHandle order_no ] >', order_no);
707
+ var changeHandle = /*#__PURE__*/function () {
708
+ var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(order_no) {
709
+ return _regeneratorRuntime().wrap(function _callee4$(_context4) {
710
+ while (1) switch (_context4.prev = _context4.next) {
711
+ case 0:
712
+ if (order_no) {
713
+ _context4.next = 2;
714
+ break;
715
+ }
716
+ return _context4.abrupt("return");
717
+ case 2:
718
+ // console.log('[订单返填 changeHandle order_no ] >', order_no);
710
719
 
711
- sessionStorage.setItem('order_no_test', order_no);
712
- orderBack({
713
- order_no: order_no,
714
- form: form,
715
- shopId: shopId,
716
- shopList: shopList,
717
- templateDetail: templateDetail,
718
- type: workOrderId ? 'edit' : 'add',
719
- callback: orderBackReplace,
720
- fromQNCreateWorkOrderByOrderNo: false,
721
- plat: plat,
722
- callbackShopId: function callbackShopId(id) {
723
- setIsOrderBackShopId(true);
724
- setTimeout(function () {
725
- setShopId(id);
726
- fillByShopId(id);
727
- }, 0);
728
- },
729
- callKey: 3,
730
- setLoading: setLoading
731
- });
732
- };
720
+ sessionStorage.setItem('order_no_test', order_no);
721
+ _context4.next = 5;
722
+ return orderBack({
723
+ order_no: order_no,
724
+ form: form,
725
+ shopId: shopId,
726
+ shopList: shopList,
727
+ templateDetail: templateDetail,
728
+ type: workOrderId ? 'edit' : 'add',
729
+ callback: orderBackReplace,
730
+ fromQNCreateWorkOrderByOrderNo: false,
731
+ plat: plat,
732
+ callbackShopId: function callbackShopId(id) {
733
+ setIsOrderBackShopId(true);
734
+ setTimeout(function () {
735
+ setShopId(id);
736
+ fillByShopId(id);
737
+ }, 0);
738
+ },
739
+ callKey: 3,
740
+ setLoading: setLoading
741
+ });
742
+ case 5:
743
+ case "end":
744
+ return _context4.stop();
745
+ }
746
+ }, _callee4);
747
+ }));
748
+ return function changeHandle(_x8) {
749
+ return _ref5.apply(this, arguments);
750
+ };
751
+ }();
733
752
  // 组件值变化
734
753
  var componentOnValueChange = function componentOnValueChange(uniqueKey, value, workOrderComponentType) {
735
754
  if (mappingConfig.config[uniqueKey]) {
@@ -798,41 +817,115 @@ var FormRender = function FormRender(props, ref) {
798
817
 
799
818
  //组件失焦事件
800
819
  var componentOnBlur = /*#__PURE__*/function () {
801
- var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(value, type) {
802
- return _regeneratorRuntime().wrap(function _callee4$(_context4) {
803
- while (1) switch (_context4.prev = _context4.next) {
820
+ var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(value, type) {
821
+ var hasTradeIdComponent, _res$data4, hasKm, userInfo, _userInfo$companyUser, _companyUserConfig$pl, _companyUserConfig, _companyUserConfig$pl2, _companyUserConfig$pl3, companyUserConfig, oldValue, res, tradeId, blurPromise, promises;
822
+ return _regeneratorRuntime().wrap(function _callee5$(_context5) {
823
+ while (1) switch (_context5.prev = _context5.next) {
804
824
  case 0:
825
+ hasTradeIdComponent = templateDetail.componentDtoList.some(function (item) {
826
+ return item.workOrderComponentType === 'TRADE_ID_INPUT';
827
+ });
828
+ if (!(type === 'expressLogisticsCode' && hasTradeIdComponent)) {
829
+ _context5.next = 21;
830
+ break;
831
+ }
832
+ hasKm = false;
833
+ try {
834
+ userInfo = JSON.parse(localStorage.getItem('reduxData_userInfo') || '{}');
835
+ if (isNull(userInfo)) {
836
+ hasKm = true;
837
+ } else {
838
+ companyUserConfig = (_userInfo$companyUser = userInfo === null || userInfo === void 0 ? void 0 : userInfo.companyUserConfig) !== null && _userInfo$companyUser !== void 0 ? _userInfo$companyUser : {};
839
+ if (typeof companyUserConfig === 'string') {
840
+ companyUserConfig = JSON.parse(companyUserConfig);
841
+ }
842
+ hasKm = (_companyUserConfig$pl = (_companyUserConfig = companyUserConfig) === null || _companyUserConfig === void 0 ? void 0 : (_companyUserConfig$pl2 = _companyUserConfig.plugins) === null || _companyUserConfig$pl2 === void 0 ? void 0 : (_companyUserConfig$pl3 = _companyUserConfig$pl2.km) === null || _companyUserConfig$pl3 === void 0 ? void 0 : _companyUserConfig$pl3.show) !== null && _companyUserConfig$pl !== void 0 ? _companyUserConfig$pl : false;
843
+ }
844
+ } catch (error) {
845
+ console.error(error);
846
+ }
847
+ console.log('---组件失焦事件--expressLogisticsCode', {
848
+ type: type,
849
+ value: value,
850
+ templateDetail: templateDetail,
851
+ hasTradeIdComponent: hasTradeIdComponent,
852
+ oldValue: form.getFieldsValue(),
853
+ hasKm: hasKm,
854
+ form: form
855
+ });
856
+ if (hasKm) {
857
+ _context5.next = 7;
858
+ break;
859
+ }
860
+ return _context5.abrupt("return");
861
+ case 7:
862
+ oldValue = form.getFieldValue('0eVTfMGEyd');
863
+ _context5.next = 10;
864
+ return queryTidByOutSid({
865
+ outSid: value
866
+ });
867
+ case 10:
868
+ res = _context5.sent;
869
+ tradeId = res === null || res === void 0 ? void 0 : (_res$data4 = res.data) === null || _res$data4 === void 0 ? void 0 : _res$data4.tid;
870
+ if (tradeId) {
871
+ _context5.next = 14;
872
+ break;
873
+ }
874
+ return _context5.abrupt("return");
875
+ case 14:
876
+ form.setFieldsValue({
877
+ m3ap1EvEyd: tradeId
878
+ });
879
+ // 创建一个异步操作的Promise
880
+ blurPromise = componentOnBlur(tradeId, 'tradeId'); // 等待异步操作完成后再执行setTimeout
881
+ _context5.next = 18;
882
+ return blurPromise;
883
+ case 18:
884
+ // 所有异步操作完成后执行
885
+ console.log('[组件失焦事件]---set', oldValue);
886
+ form.setFieldsValue({
887
+ '0eVTfMGEyd': oldValue
888
+ });
889
+ return _context5.abrupt("return");
890
+ case 21:
891
+ // 收集所有需要执行的异步操作
892
+ promises = [];
805
893
  if (type === 'tradeId') {
806
- queryLabels(value, form.getFieldValue('shopId'));
807
- queryMemberLevels(value, form.getFieldValue('shopId'));
894
+ promises.push(queryLabels(value, form.getFieldValue('shopId')));
895
+ promises.push(queryMemberLevels(value, form.getFieldValue('shopId')));
808
896
  }
809
897
  // 针对订单号组件进行当前订单查重校验
810
898
  if ((type === 'tradeId' || type === 'enterprisePaymentTid') && typeof handleChangeTradeId === 'function') {
811
- handleChangeTradeId(value);
899
+ promises.push(handleChangeTradeId(value));
812
900
  }
813
901
  if (value) {
814
- _context4.next = 6;
902
+ _context5.next = 28;
815
903
  break;
816
904
  }
817
905
  setReplaceValue(function (prev) {
818
906
  return _objectSpread(_objectSpread({}, prev), {}, _defineProperty({}, type, 0));
819
907
  });
820
908
  replaceValueRef.current = _objectSpread(_objectSpread({}, replaceValue), {}, _defineProperty({}, type, 0));
821
- return _context4.abrupt("return");
822
- case 6:
823
- queryReplaceCount(_defineProperty({}, type, value), templateDetail);
909
+ return _context5.abrupt("return");
910
+ case 28:
911
+ promises.push(queryReplaceCount(_defineProperty({}, type, value), templateDetail));
824
912
  // TODO: ERP不走订单反弹逻辑
825
913
  if ((type === 'tradeId' || type === 'enterprisePaymentTid') && !isErpUse) {
826
- changeHandle(value);
914
+ promises.push(changeHandle(value));
827
915
  }
828
- case 8:
916
+ // 等待所有异步操作完成
917
+ _context5.next = 32;
918
+ return Promise.all(promises);
919
+ case 32:
920
+ return _context5.abrupt("return", Promise.resolve());
921
+ case 33:
829
922
  case "end":
830
- return _context4.stop();
923
+ return _context5.stop();
831
924
  }
832
- }, _callee4);
925
+ }, _callee5);
833
926
  }));
834
- return function componentOnBlur(_x8, _x9) {
835
- return _ref5.apply(this, arguments);
927
+ return function componentOnBlur(_x9, _x10) {
928
+ return _ref6.apply(this, arguments);
836
929
  };
837
930
  }();
838
931
  // 切换店铺
@@ -1036,9 +1129,9 @@ var FormRender = function FormRender(props, ref) {
1036
1129
  var newComponentConfig = _objectSpread(_objectSpread({}, componentConfig), {}, {
1037
1130
  disabled: disabled
1038
1131
  });
1039
- var _ref6 = (componentConfig === null || componentConfig === void 0 ? void 0 : componentConfig.status) || {},
1040
- upgrade = _ref6.upgrade,
1041
- created = _ref6.created;
1132
+ var _ref7 = (componentConfig === null || componentConfig === void 0 ? void 0 : componentConfig.status) || {},
1133
+ upgrade = _ref7.upgrade,
1134
+ created = _ref7.created;
1042
1135
  if (['REISSUE_TRADE_ID', 'EXCHANGE_TRADE_ID', 'ERP_AFTER_SALE_TRADE_ID'].includes(workOrderComponentType)) {
1043
1136
  // 售后单id、补发单id和换货单id默认值是可见不可编辑(2)
1044
1137
  if (typeof upgrade !== 'number') {
@@ -1096,8 +1189,8 @@ var FormRender = function FormRender(props, ref) {
1096
1189
  shouldUpdate: function shouldUpdate() {
1097
1190
  return true; // TODO: 修复重复依赖的问题 https://tb.raycloud.com/task/64e4491e0b8b5c001e1099b9
1098
1191
  }
1099
- }, function (_ref7) {
1100
- var getFieldValue = _ref7.getFieldValue;
1192
+ }, function (_ref8) {
1193
+ var getFieldValue = _ref8.getFieldValue;
1101
1194
  var show = currentIdDependenceOtherFields === null || currentIdDependenceOtherFields === void 0 ? void 0 : currentIdDependenceOtherFields.reduce(function (cur, nxt) {
1102
1195
  // 如果有一项满足展示条件则展示
1103
1196
  if (cur) {
@@ -1,2 +1,2 @@
1
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_SHOP', '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', 'GY_RETURN_GOODS', 'GY_LOGISTICS'];
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_SHOP', 'WDT_EXCHANGE_GOODS', 'KM_SYSTEM_ORDER', 'KM_SEND_GOOD', 'KM_LOGISTICS', 'KM_GOODS', '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', 'GY_RETURN_GOODS', 'GY_LOGISTICS'];
@@ -242,6 +242,10 @@ export var SUBMIT_COMPONENT_GOODS_MAP = {
242
242
  JST_GOODS: {
243
243
  type: 'jstGoods',
244
244
  shopCode: 'shopCode'
245
+ },
246
+ KM_GOODS: {
247
+ type: 'kmGoods',
248
+ shopCode: 'shopCode'
245
249
  }
246
250
  };
247
251
  export var SUBMIT_COMPONENT_REISSUE_MAP = {
@@ -417,7 +417,7 @@ var handleLogisticsTrajectory = function handleLogisticsTrajectory(_ref32) {
417
417
  var addContent = _ref32.addContent,
418
418
  getNowData = _ref32.getNowData;
419
419
  return function (item) {
420
- ['trajectoryCompany', 'trajectoryCode', 'trajectorySnapshot', 'trajectoryPhone'].map(function (key) {
420
+ ['trajectoryCompany', 'trajectoryCode', 'trajectorySnapshot', 'trajectoryApiStatus', 'trajectoryPhone'].map(function (key) {
421
421
  addContent(key, getNowData("".concat(item.uniqueKey, ".").concat(key), ''));
422
422
  });
423
423
  };
@@ -882,6 +882,7 @@ var processComponent = function processComponent(_ref53) {
882
882
  case 'BS_E3_GOODS':
883
883
  case 'GY_GOODS':
884
884
  case 'JST_GOODS':
885
+ case 'KM_GOODS':
885
886
  wrapFn(handleErpGoods);
886
887
  break;
887
888
  case 'BS_EXCHANGE_GOODS':
@@ -400,6 +400,10 @@ export var orderBack = /*#__PURE__*/function () {
400
400
  sendId: '',
401
401
  sendName: ''
402
402
  }];
403
+ kmInfo.kmGoods = _objectSpread(_objectSpread({}, kmInfo.kmGoods), {}, {
404
+ kmGoods: [],
405
+ orders: []
406
+ });
403
407
  }
404
408
  if (jstOrders !== null && jstOrders !== void 0 && jstOrders.orderList && jstOrders.orderList.length > 1) {
405
409
  jstInfo.jstGoods = _objectSpread(_objectSpread({}, jstInfo.jstGoods), {}, {
@@ -940,6 +944,10 @@ export var reversalFormValues = function reversalFormValues() {
940
944
  case 'WDT_SHOP':
941
945
  prv["".concat(next.uniqueKey, "_shopCode")] = values[next.uniqueKey];
942
946
  break;
947
+ case 'KM_GOODS':
948
+ prv["".concat(next.uniqueKey, "_kmGoods")] = JSON.stringify(values[next.uniqueKey]['_kmGoods']);
949
+ prv["".concat(next.uniqueKey, "_shopCode")] = values[next.uniqueKey]['shopCode'];
950
+ break;
943
951
  }
944
952
  return prv;
945
953
  }, {});
@@ -1054,7 +1062,7 @@ export var kmSystemOrderBackValues = function kmSystemOrderBackValues(_ref9) {
1054
1062
  //如果没有选择的值不返填,会有两种情况 1.有值为空 2.没有值 为空的时候需要返填
1055
1063
  if (!(value !== null && value !== void 0 && value.selectedRows)) return;
1056
1064
  var kmGoodsComponent = (_templateList$compone5 = templateList.componentDtoList) === null || _templateList$compone5 === void 0 ? void 0 : _templateList$compone5.filter(function (item) {
1057
- return ['KM_SEND_GOOD', 'KM_LOGISTICS'].includes(item.workOrderComponentType) && !item.notOrderBack;
1065
+ return ['KM_GOODS', 'KM_SEND_GOOD', 'KM_LOGISTICS'].includes(item.workOrderComponentType) && !item.notOrderBack;
1058
1066
  });
1059
1067
  if (!(kmGoodsComponent !== null && kmGoodsComponent !== void 0 && kmGoodsComponent.length)) return;
1060
1068
  var tIdCom = (_templateList$compone6 = templateList.componentDtoList) === null || _templateList$compone6 === void 0 ? void 0 : _templateList$compone6.find(function (item) {
@@ -4,7 +4,7 @@ import { servers } from '@kmkf-fe-packages/kmkf-utils';
4
4
  var orderBackKeyListMap = {
5
5
  hasJst: ['JST_SYSTEM_ORDER', 'JST_GOODS', 'JST_REISSUE_GOODS', 'JST_LOGISTICS', 'JST_ITEM_SELECT_THIRD', 'JST_SUPPLY', 'JST_SEND_GOOD'],
6
6
  hasBs: ['BS_SIGNING_TIME', 'BS_SEND_TIME', 'BS_TRADE_PAYMENT_TIME', 'BS_NET_RECEIPTS', 'BS_PACKAGE_WEIGHT', 'BS_GOODS', 'BS_DEPOSIT', 'BS_LOGISTICS', 'BS_SEND_GOOD', 'BS_POSTING', 'BS_SYSTEM_ORDER', 'BS_DELIVERY_NO'],
7
- hasKm: ['KM_SYSTEM_ORDER', 'KM_LOGISTICS'],
7
+ hasKm: ['KM_SYSTEM_ORDER', 'KM_LOGISTICS', 'KM_GOODS'],
8
8
  hasWdt: ['WDT_SYSTEM_ORDER', 'WDT_GOODS', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WDT_REISSUE_GOODS', 'WDT_SHOP'],
9
9
  hasBsE3: ['BS_E3_SYSTEM_ORDER', 'BS_E3_GOODS', 'BS_E3_REISSUE_GOODS', 'BS_E3_LOGISTICS', 'BS_E3_SEND_GOOD'],
10
10
  hasWln: ['WLN_SYSTEM_ORDER', 'WLN_GOODS', 'WLN_LOGISTICS', 'WLN_SEND_GOOD'],
@@ -279,9 +279,9 @@ var processLogisticsInterceptionMore = function processLogisticsInterceptionMore
279
279
  };
280
280
  var processLogisticsTrajectory = function processLogisticsTrajectory(getValue) {
281
281
  return function (nex, config) {
282
- var subFields = ['trajectoryCompany', 'trajectoryCode', 'trajectorySnapshot', 'trajectoryPhone'];
282
+ var subFields = ['trajectoryCompany', 'trajectoryCode', 'trajectorySnapshot', 'trajectoryPhone', 'trajectoryApiStatus'];
283
283
  var map = subFields.reduce(function (cur, nxt) {
284
- return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, nxt, getValue("".concat(nex.uniqueKey, "_").concat(nxt))));
284
+ return nxt === 'trajectoryApiStatus' ? _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, nxt, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_trajectoryApiStatus")), {}))) : _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, nxt, getValue("".concat(nex.uniqueKey, "_").concat(nxt))));
285
285
  }, {});
286
286
  return _defineProperty({}, nex.uniqueKey, map);
287
287
  };
@@ -598,6 +598,33 @@ var processJstGoods = function processJstGoods(templateColumns) {
598
598
  };
599
599
  };
600
600
  };
601
+ var processKmGoods = function processKmGoods(templateColumns) {
602
+ return function (getValue) {
603
+ return function (nex, config) {
604
+ var _values = {
605
+ kmGoods: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_kmGoods")), []),
606
+ shopCode: getValue("".concat(nex.uniqueKey, "_shopCode"))
607
+ };
608
+ var selectIds = [];
609
+ var orderNo = '';
610
+ var tradeId = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
611
+ return col.workOrderComponentType === 'TRADE_ID_INPUT';
612
+ });
613
+ if (tradeId) {
614
+ orderNo = getValue("".concat(tradeId.uniqueKey, "_").concat(updateWorkTypeKeys[tradeId.workOrderComponentType]));
615
+ }
616
+ var kmSystemOrder = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
617
+ return col.workOrderComponentType === 'KM_SYSTEM_ORDER';
618
+ });
619
+ if (kmSystemOrder) {
620
+ selectIds = jsonParseSecurity(getValue("".concat(kmSystemOrder.uniqueKey, "_").concat(systemOrderMap[kmSystemOrder.workOrderComponentType].ids)), []);
621
+ }
622
+ _values.selectIds = selectIds;
623
+ _values.orderNo = orderNo;
624
+ return _defineProperty({}, nex.uniqueKey, _values);
625
+ };
626
+ };
627
+ };
601
628
  var processGyGoods = function processGyGoods(templateColumns) {
602
629
  return function (getValue) {
603
630
  return function (nex, config) {
@@ -935,14 +962,14 @@ var processJstReturnGoods = function processJstReturnGoods(templateColumns) {
935
962
  };
936
963
  var processLabel = function processLabel(getValue) {
937
964
  return function (nex, config) {
938
- var _ref65;
939
- return _ref65 = {}, _defineProperty(_ref65, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _defineProperty(_ref65, "".concat(nex.uniqueKey, "_label"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _ref65;
965
+ var _ref66;
966
+ return _ref66 = {}, _defineProperty(_ref66, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _defineProperty(_ref66, "".concat(nex.uniqueKey, "_label"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _ref66;
940
967
  };
941
968
  };
942
969
  var processMemberLevel = function processMemberLevel(getValue) {
943
970
  return function (nex, config) {
944
- var _ref66;
945
- return _ref66 = {}, _defineProperty(_ref66, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _defineProperty(_ref66, "".concat(nex.uniqueKey, "_memberLevel"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _ref66;
971
+ var _ref67;
972
+ return _ref67 = {}, _defineProperty(_ref67, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _defineProperty(_ref67, "".concat(nex.uniqueKey, "_memberLevel"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _ref67;
946
973
  };
947
974
  };
948
975
  var processAfterSalesOrderId = function processAfterSalesOrderId(getValue) {
@@ -1054,6 +1081,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
1054
1081
  WDT_GOODS: processWdtGoods(templateColumns),
1055
1082
  BS_E3_GOODS: processBsE3Goods(templateColumns),
1056
1083
  GY_GOODS: processGyGoods(templateColumns),
1084
+ KM_GOODS: processKmGoods(templateColumns),
1057
1085
  JST_GOODS: processJstGoods(templateColumns),
1058
1086
  BS_REISSUE_GOODS: processBsReissueGoods,
1059
1087
  BS_EXCHANGE_GOODS: processBsExchangeGoods,
@@ -6,6 +6,7 @@ export declare const selectFlowList: ((state: {
6
6
  paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
7
7
  singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
8
8
  logicFlow: import("./types").LogicFlowState;
9
+ flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
9
10
  }) => import("./types").LogicFlow[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").LogicFlowState) => import("./types").LogicFlow[], {
10
11
  clearCache: () => void;
11
12
  }> & {
@@ -19,6 +20,7 @@ export declare const selectGroupFlowList: ((state: {
19
20
  paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
20
21
  singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
21
22
  logicFlow: import("./types").LogicFlowState;
23
+ flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
22
24
  }) => import("./types").Option[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").LogicFlowState) => import("./types").Option[], {
23
25
  clearCache: () => void;
24
26
  }> & {
@@ -32,6 +34,7 @@ export declare const selectFlowTemplateGroupWorkOrderTemplateList: ((state: {
32
34
  paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
33
35
  singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
34
36
  logicFlow: import("./types").LogicFlowState;
37
+ flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
35
38
  }) => import("./types").Option[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").LogicFlowState) => import("./types").Option[], {
36
39
  clearCache: () => void;
37
40
  }> & {
@@ -6,6 +6,7 @@ export declare const selectPaymentWorkOrderExamineModalVisible: ((state: {
6
6
  paymentWorkOrder: import("./types").PaymentWorkOrderState;
7
7
  singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
8
8
  logicFlow: import("../logicFlow/types").LogicFlowState;
9
+ flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
9
10
  }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
10
11
  clearCache: () => void;
11
12
  }> & {
@@ -19,6 +20,7 @@ export declare const selectCurrentPaymentRecord: ((state: {
19
20
  paymentWorkOrder: import("./types").PaymentWorkOrderState;
20
21
  singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
21
22
  logicFlow: import("../logicFlow/types").LogicFlowState;
23
+ flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
22
24
  }) => any) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => any, {
23
25
  clearCache: () => void;
24
26
  }> & {
@@ -32,6 +34,7 @@ export declare const selectPaymentWorkOrderUnExamineModalVisible: ((state: {
32
34
  paymentWorkOrder: import("./types").PaymentWorkOrderState;
33
35
  singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
34
36
  logicFlow: import("../logicFlow/types").LogicFlowState;
37
+ flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
35
38
  }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
36
39
  clearCache: () => void;
37
40
  }> & {
@@ -45,6 +48,7 @@ export declare const selectDeletePaymentWorkOrderVisible: ((state: {
45
48
  paymentWorkOrder: import("./types").PaymentWorkOrderState;
46
49
  singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
47
50
  logicFlow: import("../logicFlow/types").LogicFlowState;
51
+ flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
48
52
  }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
49
53
  clearCache: () => void;
50
54
  }> & {
@@ -58,6 +62,7 @@ export declare const selectFlagPayModalVisible: ((state: {
58
62
  paymentWorkOrder: import("./types").PaymentWorkOrderState;
59
63
  singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
60
64
  logicFlow: import("../logicFlow/types").LogicFlowState;
65
+ flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
61
66
  }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
62
67
  clearCache: () => void;
63
68
  }> & {
@@ -71,6 +76,7 @@ export declare const selectLogModalVisible: ((state: {
71
76
  paymentWorkOrder: import("./types").PaymentWorkOrderState;
72
77
  singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
73
78
  logicFlow: import("../logicFlow/types").LogicFlowState;
79
+ flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
74
80
  }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
75
81
  clearCache: () => void;
76
82
  }> & {
@@ -84,6 +90,7 @@ export declare const selectPaymentFormModalVisible: ((state: {
84
90
  paymentWorkOrder: import("./types").PaymentWorkOrderState;
85
91
  singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
86
92
  logicFlow: import("../logicFlow/types").LogicFlowState;
93
+ flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
87
94
  }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
88
95
  clearCache: () => void;
89
96
  }> & {
@@ -97,6 +104,7 @@ export declare const selectRepeatVisible: ((state: {
97
104
  paymentWorkOrder: import("./types").PaymentWorkOrderState;
98
105
  singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
99
106
  logicFlow: import("../logicFlow/types").LogicFlowState;
107
+ flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
100
108
  }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
101
109
  clearCache: () => void;
102
110
  }> & {
@@ -110,6 +118,7 @@ export declare const selectRepeatWorkOrderList: ((state: {
110
118
  paymentWorkOrder: import("./types").PaymentWorkOrderState;
111
119
  singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
112
120
  logicFlow: import("../logicFlow/types").LogicFlowState;
121
+ flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
113
122
  }) => string[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => string[], {
114
123
  clearCache: () => void;
115
124
  }> & {
@@ -90,3 +90,4 @@ export declare const queryMemberLevel: (data: {
90
90
  tid: string;
91
91
  }) => Promise<serverProps<Array<string>>>;
92
92
  export declare const queryShopByTid: (data: any) => Promise<any>;
93
+ export declare const queryTidByOutSid: (data: any) => Promise<any>;
@@ -586,4 +586,12 @@ export var queryShopByTid = function queryShopByTid(data) {
586
586
  method: 'post',
587
587
  data: data
588
588
  });
589
+ };
590
+ //通过物流单号获取订单号
591
+ export var queryTidByOutSid = function queryTidByOutSid(data) {
592
+ return request({
593
+ url: '/qy/gdfw/order/queryTidByOutSid',
594
+ method: 'post',
595
+ data: data
596
+ });
589
597
  };
@@ -6,6 +6,7 @@ export declare const selectorSingleTemplateList: ((state: {
6
6
  paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
7
7
  singleWorkOrder: import("./types").SingleWorkOrderState;
8
8
  logicFlow: import("../logicFlow/types").LogicFlowState;
9
+ flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
9
10
  }) => import("./types").SelectI[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => import("./types").SelectI[], {
10
11
  clearCache: () => void;
11
12
  }> & {
@@ -19,6 +20,7 @@ export declare const selectDeleteCustomizeWorkOrderModalVisible: ((state: {
19
20
  paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
20
21
  singleWorkOrder: import("./types").SingleWorkOrderState;
21
22
  logicFlow: import("../logicFlow/types").LogicFlowState;
23
+ flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
22
24
  }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => boolean, {
23
25
  clearCache: () => void;
24
26
  }> & {
@@ -32,6 +34,7 @@ export declare const selectorCurrentCustomizeRecord: ((state: {
32
34
  paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
33
35
  singleWorkOrder: import("./types").SingleWorkOrderState;
34
36
  logicFlow: import("../logicFlow/types").LogicFlowState;
37
+ flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
35
38
  }) => any) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => any, {
36
39
  clearCache: () => void;
37
40
  }> & {
@@ -45,6 +48,7 @@ export declare const selectorTemplateId: ((state: {
45
48
  paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
46
49
  singleWorkOrder: import("./types").SingleWorkOrderState;
47
50
  logicFlow: import("../logicFlow/types").LogicFlowState;
51
+ flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
48
52
  }) => string) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => string, {
49
53
  clearCache: () => void;
50
54
  }> & {
@@ -58,6 +62,7 @@ export declare const selectorFormModalVisible: ((state: {
58
62
  paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
59
63
  singleWorkOrder: import("./types").SingleWorkOrderState;
60
64
  logicFlow: import("../logicFlow/types").LogicFlowState;
65
+ flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
61
66
  }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => boolean, {
62
67
  clearCache: () => void;
63
68
  }> & {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
3
- "version": "2.0.63",
3
+ "version": "2.0.64",
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.0.63",
36
- "@kmkf-fe-packages/kmkf-utils": "2.0.63",
37
- "@kmkf-fe-packages/services-components": "2.0.63",
35
+ "@kmkf-fe-packages/basic-components": "2.0.64",
36
+ "@kmkf-fe-packages/kmkf-utils": "2.0.64",
37
+ "@kmkf-fe-packages/services-components": "2.0.64",
38
38
  "@reduxjs/toolkit": "^1.8.5",
39
39
  "ahooks": "^3.7.4",
40
40
  "copy-to-clipboard": "^3.3.3",
@@ -73,7 +73,7 @@
73
73
  "publishConfig": {
74
74
  "access": "public"
75
75
  },
76
- "gitHead": "a6618afd20337b47d38f8705307d746c73e07fdb",
76
+ "gitHead": "d2af71326cde542670f96569bb6c028ac7c57bf7",
77
77
  "gitHooks": {
78
78
  "pre-commit": "lint-staged"
79
79
  }
@@ -1,52 +0,0 @@
1
- "use strict";
2
-
3
- exports.__esModule = true;
4
- var react_1 = require("react");
5
- var react_redux_1 = require("react-redux");
6
- var toolkit_1 = require("@reduxjs/toolkit");
7
- var getTemplate = function getTemplate(companyUserConfig) {
8
- var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
9
- return JSON.stringify({
10
- hasWln: (_c = (_b = (_a = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : companyUserConfig.plugins) === null || _a === void 0 ? void 0 : _a.wln) === null || _b === void 0 ? void 0 : _b.show) !== null && _c !== void 0 ? _c : false,
11
- hasWdt: (_f = (_e = (_d = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : companyUserConfig.plugins) === null || _d === void 0 ? void 0 : _d.wdt) === null || _e === void 0 ? void 0 : _e.show) !== null && _f !== void 0 ? _f : false,
12
- hasBs: (_j = (_h = (_g = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : companyUserConfig.plugins) === null || _g === void 0 ? void 0 : _g.bs) === null || _h === void 0 ? void 0 : _h.show) !== null && _j !== void 0 ? _j : false,
13
- hasE3: (_m = (_l = (_k = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : companyUserConfig.plugins) === null || _k === void 0 ? void 0 : _k.bse3) === null || _l === void 0 ? void 0 : _l.show) !== null && _m !== void 0 ? _m : false,
14
- hasJst: (_q = (_p = (_o = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : companyUserConfig.plugins) === null || _o === void 0 ? void 0 : _o.jst) === null || _p === void 0 ? void 0 : _p.show) !== null && _q !== void 0 ? _q : false,
15
- hasGy: (_t = (_s = (_r = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : companyUserConfig.plugins) === null || _r === void 0 ? void 0 : _r.gy) === null || _s === void 0 ? void 0 : _s.show) !== null && _t !== void 0 ? _t : false
16
- });
17
- };
18
- function useGetHasErpData() {
19
- var companyUserConfig = react_redux_1.useSelector(toolkit_1.createSelector([function (state) {
20
- var _a, _b, _c, _d;
21
- console.log("state--useSelector", state);
22
- /**
23
- * pc main
24
- * 端 workOrder
25
- * **/
26
- return (_d = (_b = (_a = state === null || state === void 0 ? void 0 : state.main) === null || _a === void 0 ? void 0 : _a.userInfo) !== null && _b !== void 0 ? _b : (_c = state === null || state === void 0 ? void 0 : state.workOrder) === null || _c === void 0 ? void 0 : _c.userInfo) !== null && _d !== void 0 ? _d : {};
27
- }], function (state) {
28
- var _a;
29
- var companyUserConfig = (_a = state === null || state === void 0 ? void 0 : state.companyUserConfig) !== null && _a !== void 0 ? _a : {};
30
- if (typeof companyUserConfig === "string") {
31
- try {
32
- companyUserConfig = JSON.parse(companyUserConfig);
33
- } catch (e) {
34
- console.error("companyUserConfig转换异常", companyUserConfig);
35
- companyUserConfig = {};
36
- }
37
- }
38
- return companyUserConfig;
39
- }));
40
- var _a = react_1.useState(getTemplate({})),
41
- hasErpDataJson = _a[0],
42
- setHasErpDataJson = _a[1];
43
- react_1.useEffect(function () {
44
- setHasErpDataJson(getTemplate(companyUserConfig));
45
- console.log("companyUserConfig---", companyUserConfig);
46
- }, [companyUserConfig]);
47
- var hasErpData = react_1.useMemo(function () {
48
- return JSON.parse(hasErpDataJson);
49
- }, [hasErpDataJson]);
50
- return hasErpData;
51
- }
52
- exports["default"] = useGetHasErpData;