@kmkf-fe-packages/kmkf-work-order-service-component 2.7.3-beta.10 → 2.7.3-beta.12

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 (5) hide show
  1. package/dist/esm/FlowTemplateDetailV2/components/FormRender/index.js +10 -5
  2. package/dist/esm/FlowTemplateDetailV2/index.js +10 -8
  3. package/dist/esm/common/utils/tools.d.ts +1 -1
  4. package/dist/esm/common/utils/tools.js +15 -13
  5. package/package.json +2 -2
package/dist/esm/FlowTemplateDetailV2/components/FormRender/index.js CHANGED
@@ -454,7 +454,7 @@ var FormRender = function FormRender(props, ref) {
454
454
  }
455
455
  return prv;
456
456
  }, ''); //获取保存时的订单缓存数据，解决用户显隐组件不展示二次编辑没有订单信息的问题
457
- getCacheInfo = JSON.parse(sessionStorage.getItem('cacheOrderInfo') || '{}');
457
+ getCacheInfo = autoSubmit ? {} : JSON.parse(sessionStorage.getItem('cacheOrderInfo') || '{}');
458
458
  newFormValues = _objectSpread({}, getCacheInfo[jsonMapOrderId] || {});
459
459
  newFormValues = reversalFormValues(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, newFormValues);
460
460
  newRecord.jsonMap = _objectSpread(_objectSpread(_objectSpread({}, newFormValues), jsonMap), newRecord.jsonMap);
@@ -526,6 +526,7 @@ var FormRender = function FormRender(props, ref) {
526
526
  plat: plat,
527
527
  callKey: 1,
528
528
  setLoading: setLoading,
529
+ skipCache: autoSubmit,
529
530
  matchLogisticsNo: lastLogisticsOrderBackSource === null || lastLogisticsOrderBackSource === void 0 ? void 0 : lastLogisticsOrderBackSource.logisticsCode,
530
531
  skipOrderBackUniqueKeys: lastLogisticsOrderBackSource !== null && lastLogisticsOrderBackSource !== void 0 && lastLogisticsOrderBackSource.uniqueKey ? [lastLogisticsOrderBackSource.uniqueKey] : []
531
532
  });
@@ -611,12 +612,12 @@ var FormRender = function FormRender(props, ref) {
611
612
  fillByShopId(shopId);
612
613
  initFormValues = null;
613
614
  if (plat !== null && plat !== void 0 && plat.subOrderNo) {
614
- _getCacheInfo = JSON.parse(sessionStorage.getItem('cacheOmsOrderInfo') || '{}');
615
+ _getCacheInfo = autoSubmit ? {} : JSON.parse(sessionStorage.getItem('cacheOmsOrderInfo') || '{}');
615
616
  if (plat !== null && plat !== void 0 && plat.subOrderNo && plat.buyerId) {
616
617
  initFormValues = (_getCacheInfo2 = _getCacheInfo["".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId)]) === null || _getCacheInfo2 === void 0 ? void 0 : _getCacheInfo2[plat === null || plat === void 0 ? void 0 : plat.subOrderNo];
617
618
  }
618
619
  } else {
619
- _getCacheInfo3 = JSON.parse(sessionStorage.getItem('cacheOrderInfo') || '{}');
620
+ _getCacheInfo3 = autoSubmit ? {} : JSON.parse(sessionStorage.getItem('cacheOrderInfo') || '{}');
620
621
  if (orderNo && plat.buyerId) {
621
622
  initFormValues = (_getCacheInfo4 = _getCacheInfo3["".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId)]) === null || _getCacheInfo4 === void 0 ? void 0 : _getCacheInfo4[orderNo];
622
623
  } else if (!orderNo && plat.buyerId) {
@@ -675,7 +676,8 @@ var FormRender = function FormRender(props, ref) {
675
676
  // TODO: 只有在千牛端通过订单号录入工单的时候，订单备注不需要反填
676
677
  plat: plat,
677
678
  callKey: 2,
678
- setLoading: setLoading
679
+ setLoading: setLoading,
680
+ skipCache: autoSubmit
679
681
  });
680
682
  case 90:
681
683
  _context2.next = 94;
@@ -980,6 +982,7 @@ var FormRender = function FormRender(props, ref) {
980
982
  },
981
983
  callKey: 3,
982
984
  setLoading: setLoading,
985
+ skipCache: autoSubmit,
983
986
  matchLogisticsNo: options === null || options === void 0 ? void 0 : options.matchLogisticsNo,
984
987
  skipOrderBackUniqueKeys: options === null || options === void 0 ? void 0 : options.skipOrderBackUniqueKeys
985
988
  });
@@ -1428,7 +1431,8 @@ var FormRender = function FormRender(props, ref) {
1428
1431
  }, 0);
1429
1432
  },
1430
1433
  callKey: 4,
1431
- setLoading: setLoading
1434
+ setLoading: setLoading,
1435
+ skipCache: autoSubmit
1432
1436
  });
1433
1437
  }
1434
1438
  } else {
@@ -1725,6 +1729,7 @@ var FormRender = function FormRender(props, ref) {
1725
1729
  var changeValuesCacheOrderInfo = throttle(function (value, tempLateList) {
1726
1730
  //如果店铺id不存在 不缓存
1727
1731
  if (!(value !== null && value !== void 0 && value.shopId)) return;
1732
+ if (autoSubmit) return;
1728
1733
  //如果是初始化创建工单 缓存信息
1729
1734
  if (!workOrderId && ['fxg', 'tb', 'ks', 'xiaozhi'].includes(plat.platform)) {
1730
1735
  var _findComponentUniqueK;
package/dist/esm/FlowTemplateDetailV2/index.js CHANGED
@@ -509,14 +509,16 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
509
509
  if (res.success) {
510
510
  handleSuccessCallBack('submit');
511
511
  //删除缓存的订单信息
512
- deleteCacheOrder({
513
- templateList: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo9 = currentNodeDetail.workOrderTemplateInfo) === null || _currentNodeDetail$wo9 === void 0 ? void 0 : _currentNodeDetail$wo9.componentDtoList,
514
- values: formData,
515
- nodeId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo.flowTemplateConfig.nodeId,
516
- flowTemplateId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo.flowTemplateConfig.flowTemplateId,
517
- plat: plat,
518
- unDeleteOrderInfo: false
519
- });
512
+ if (!autoSubmit) {
513
+ deleteCacheOrder({
514
+ templateList: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo9 = currentNodeDetail.workOrderTemplateInfo) === null || _currentNodeDetail$wo9 === void 0 ? void 0 : _currentNodeDetail$wo9.componentDtoList,
515
+ values: formData,
516
+ nodeId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo.flowTemplateConfig.nodeId,
517
+ flowTemplateId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo.flowTemplateConfig.flowTemplateId,
518
+ plat: plat,
519
+ unDeleteOrderInfo: false
520
+ });
521
+ }
520
522
  if (!autoSubmit) {
521
523
  reFreshPanel();
522
524
  message.success('提交成功');
package/dist/esm/common/utils/tools.d.ts CHANGED
@@ -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, skipOrderBackUniqueKeys, }: any) => Promise<void>;
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>;
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;
package/dist/esm/common/utils/tools.js CHANGED
@@ -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, 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, _bsOrders$orders, _bsE3Orders$orderList, _wlnOrders$orders, _wdtOrders$trades, _wdtInfo$wdtSystemOrd, _wdtInfo$wdtSystemOrd2, _gyOrders$trades, _jyOrders$trades, _jkyOrders$trades, _kmOrders$orderDetail, _kmInfo$kmSystemOrder, _kmInfo$kmSystemOrder2, _value$selectIds, _value$showOrderInfo, _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, kmVideoOrder, orderSubFormOrder, wdtReturnOrder, _data$value2, orderInfo, jstOrders, bsOrders, wlnOrders, wdtOrders, bsE3Orders, kmOrders, gyOrders, jyOrders, skxOrders, skxReturnOrders, jkyOrders, wdtReturnOrders, bsInfo, wlnInfo, bsE3Info, wdtInfo, kmInfo, orderSubFormInfo, gyInfo, jyInfo, jkyInfo, jstInfo, skxInfo, skxReturnInfo, formValue, afterSalesOrderField, value, afterSalesOrderSelectOrder, 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, 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, _bsOrders$orders, _bsE3Orders$orderList, _wlnOrders$orders, _wdtOrders$trades, _wdtInfo$wdtSystemOrd, _wdtInfo$wdtSystemOrd2, _gyOrders$trades, _jyOrders$trades, _jkyOrders$trades, _kmOrders$orderDetail, _kmInfo$kmSystemOrder, _kmInfo$kmSystemOrder2, _value$selectIds, _value$showOrderInfo, _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, kmVideoOrder, orderSubFormOrder, wdtReturnOrder, _data$value2, orderInfo, jstOrders, bsOrders, wlnOrders, wdtOrders, bsE3Orders, kmOrders, gyOrders, jyOrders, skxOrders, skxReturnOrders, jkyOrders, wdtReturnOrders, bsInfo, wlnInfo, bsE3Info, wdtInfo, kmInfo, orderSubFormInfo, gyInfo, jyInfo, jkyInfo, jstInfo, skxInfo, skxReturnInfo, formValue, afterSalesOrderField, value, afterSalesOrderSelectOrder, 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, 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, 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);
@@ -771,17 +771,19 @@ export var orderBack = /*#__PURE__*/function () {
771
771
  });
772
772
  }
773
773
  //缓存订单返填的信息，用来解决用户保存显隐返填组件，二次编辑订单信息丢失
774
- if (plat !== null && plat !== void 0 && plat.subOrderNo) {
775
- setSessionStorage.setCacheOmsOrderInfo({
776
- itemKey: "".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId),
777
- itemValue: _defineProperty({}, plat === null || plat === void 0 ? void 0 : plat.subOrderNo, _objectSpread(_objectSpread({}, formValue), values))
778
- });
779
- } else {
780
- setSessionStorage.setCacheOrderInfo({
781
- itemKey: "".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId),
782
- itemValue: _defineProperty({}, order_no, _objectSpread(_objectSpread({}, formValue), values)),
783
- ext: _defineProperty({}, order_no, values)
784
- });
774
+ if (!skipCache) {
775
+ if (plat !== null && plat !== void 0 && plat.subOrderNo) {
776
+ setSessionStorage.setCacheOmsOrderInfo({
777
+ itemKey: "".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId),
778
+ itemValue: _defineProperty({}, plat === null || plat === void 0 ? void 0 : plat.subOrderNo, _objectSpread(_objectSpread({}, formValue), values))
779
+ });
780
+ } else {
781
+ setSessionStorage.setCacheOrderInfo({
782
+ itemKey: "".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId),
783
+ itemValue: _defineProperty({}, order_no, _objectSpread(_objectSpread({}, formValue), values)),
784
+ ext: _defineProperty({}, order_no, values)
785
+ });
786
+ }
785
787
  }
786
788
  }
787
789
  // console.log('orderback', values);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
3
- "version": "2.7.3-beta.10",
3
+ "version": "2.7.3-beta.12",
4
4
  "module": "dist/esm/index.js",
5
5
  "typings": "dist/esm/index.d.ts",
6
6
  "files": [
@@ -75,7 +75,7 @@
75
75
  "publishConfig": {
76
76
  "access": "public"
77
77
  },
78
- "gitHead": "a3b928789d7e0dcdba730abd31155cdfbeeb1709",
78
+ "gitHead": "1d0f75d07bfb7697f8379903c544daa623fd0c46",
79
79
  "gitHooks": {
80
80
  "pre-commit": "lint-staged"
81
81
  }