@kmkf-fe-packages/kmkf-work-order-service-component 1.6.0-beta.8 → 1.6.1

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 (7) hide show
  1. package/README.md +1 -1
  2. package/dist/esm/FlowTemplateDetail/components/FormRender/index.js +8 -45
  3. package/dist/esm/FlowTemplateDetail/index.js +16 -7
  4. package/dist/esm/common/utils/tools.js +19 -27
  5. package/dist/esm/index.d.ts +1 -1
  6. package/dist/esm/index.js +1 -1
  7. package/package.json +5 -5
package/README.md CHANGED
@@ -63,4 +63,4 @@ const Text = ()=>{
63
63
 
64
64
  ```
65
65
 
66
- | 字段 | 说明 | 数据类型 | | ----------------- | ---------------- | ------------------------------------ | | platform | 平台 | TAOBAO =淘宝\|FXG=抖音\|PDD=拼多多\| | | shopId | 店铺 ID | number | | buyerNick | 买家昵称 | string | | buyerId | 买家 id | string | | orderNo | 订单 id | string | | onEmpowerCallback | 授权弹框点击回调 | function |
66
+ | 字段 | 说明 | 数据类型 | | ----------------- | ---------------- | ------------------------------------ | | platform | 平台 | TAOBAO =淘宝\|FXG=抖音\|PDD=拼多多\| | | shopId | 店铺 ID | number | | buyerNick | 买家昵称 | string | | buyerId | 买家 id | string | | orderNo | 订单 id | string | | onEmpowerCallback | 授权弹框点击回调 | function |
package/dist/esm/FlowTemplateDetail/components/FormRender/index.js CHANGED
@@ -28,7 +28,7 @@ import { get, some, set, every, cloneDeep, isEmpty, intersection, throttle, grou
28
28
  import 'moment/locale/zh-cn';
29
29
  import { calcWorkOrderList, orderBack, getReplaceWarnValues, COMPONENT_MAP_NAME, EXCLUDE_REPLACE_TOP_COMPONENT,
30
30
  // 重复检验不需要展示在顶部的
31
- INNER_REPLACE_COMPONENT, reversalFormValues, bsSystemOrderBackValues, wlnSystemOrderBackValues, getMappingConfigByTemplateDetail, wdtSystemOrderBackValues, setLogisticsInfo, COMPONENT_MAP } from "../../../common/utils/tools";
31
+ INNER_REPLACE_COMPONENT, reversalFormValues, bsSystemOrderBackValues, wlnSystemOrderBackValues, getMappingConfigByTemplateDetail, wdtSystemOrderBackValues, setLogisticsInfo } from "../../../common/utils/tools";
32
32
  import { replaceCheck, orderDetail, queryLabelByTradeId } from "../../../model/servers/api";
33
33
  import { factory } from '@kmkf-fe-packages/services-components';
34
34
  import { getExpression, formatDisplayConfig, isNull, LabelData } from '@kmkf-fe-packages/kmkf-utils';
@@ -194,7 +194,7 @@ var FormRender = function FormRender(props, ref) {
194
194
  var obj = {};
195
195
  Object.keys(params).forEach(function (key) {
196
196
  var _params$key;
197
- if (params[key] && typeof params[key] === 'string' && ((_params$key = params[key]) === null || _params$key === void 0 ? void 0 : _params$key.indexOf('*')) > -1) {
197
+ if (params[key] && ((_params$key = params[key]) === null || _params$key === void 0 ? void 0 : _params$key.indexOf('*')) > -1) {
198
198
  obj[key] = 0;
199
199
  }
200
200
  });
@@ -460,45 +460,8 @@ var FormRender = function FormRender(props, ref) {
460
460
  (antFormEl === null || antFormEl === void 0 ? void 0 : antFormEl.length) > 0 && set(antFormEl, '0.scrollTop', 0);
461
461
  resetMappdingHideComponents();
462
462
  };
463
- var repeatWarningDataSchema = function repeatWarningDataSchema(formValue, templateDetail) {
464
- var getKeyByValue = function getKeyByValue(value) {
465
- return Object.keys(COMPONENT_MAP).find(function (key) {
466
- return COMPONENT_MAP[key] === value;
467
- });
468
- };
469
- var needRepeatWarnComponent = Object.values(COMPONENT_MAP);
470
- return templateDetail.componentDtoList.reduce(function (cur, nxt) {
471
- if (needRepeatWarnComponent !== null && needRepeatWarnComponent !== void 0 && needRepeatWarnComponent.includes(nxt === null || nxt === void 0 ? void 0 : nxt.workOrderComponentType)) {
472
- var instance = factory(nxt.workOrderComponentType, {
473
- id: nxt.uniqueKey,
474
- name: nxt.name,
475
- componentConfig: nxt.componentConfig,
476
- effects: {},
477
- type: nxt.workOrderComponentType
478
- });
479
- var _id = instance === null || instance === void 0 ? void 0 : instance.id;
480
- var value = formValue[_id];
481
- var _key = getKeyByValue(nxt.workOrderComponentType);
482
- // TODO: 如果是订单号组件, 将值设置为orderNo
483
- if (nxt.workOrderComponentType === 'TRADE_ID_INPUT') {
484
- _key = 'orderNo';
485
- }
486
- if (_key) {
487
- cur[_key] = value;
488
- }
489
- }
490
- return cur;
491
- }, {});
492
- };
493
463
  useEffect(function () {
494
- if (isErpUse && templateDetail) {
495
- var formValue = form.getFieldsValue(true);
496
- console.debug('表单内容值', formValue);
497
- // TODO: 拼装需要重复提醒的组件数据格式
498
- var value = repeatWarningDataSchema(formValue, templateDetail);
499
- console.debug('重复提醒转换之后数据', value);
500
- return orderBackReplace(value, templateDetail);
501
- }
464
+ if (isErpUse) return;
502
465
  queryDetail({
503
466
  workOrderId: workOrderId,
504
467
  shopId: shopId,
@@ -508,7 +471,7 @@ var FormRender = function FormRender(props, ref) {
508
471
  buyerId: buyerId,
509
472
  buyerNick: buyerNick
510
473
  });
511
- }, [workOrderId, record, shopId, isErpUse, templateDetail]);
474
+ }, [workOrderId, record, shopId, isErpUse]);
512
475
 
513
476
  // 重置映射隐藏的组件, 目前只有单选、下拉组件可能会因为映射关系隐藏
514
477
  var resetMappdingHideComponents = function resetMappdingHideComponents() {
@@ -539,8 +502,8 @@ var FormRender = function FormRender(props, ref) {
539
502
 
540
503
  // 批量映射
541
504
  var batchFillByMapping = function batchFillByMapping(values) {
542
- for (var _key2 in values) {
543
- fillByMapping(_key2, values[_key2]);
505
+ for (var _key in values) {
506
+ fillByMapping(_key, values[_key]);
544
507
  }
545
508
  };
546
509
  // 组件映射
@@ -553,8 +516,8 @@ var FormRender = function FormRender(props, ref) {
553
516
  form.setFieldsValue(mapping === null || mapping === void 0 ? void 0 : mapping[triggerValue]);
554
517
  } else {
555
518
  var resetSet = new Set();
556
- for (var _key3 in mapping) {
557
- for (var uniqueKey in mapping[_key3]) {
519
+ for (var _key2 in mapping) {
520
+ for (var uniqueKey in mapping[_key2]) {
558
521
  resetSet.add(uniqueKey);
559
522
  }
560
523
  }
package/dist/esm/FlowTemplateDetail/index.js CHANGED
@@ -45,8 +45,8 @@ import SubmitRemindModal from "./components/SubmitRemindModal";
45
45
  import { useSignal } from "../hooks/useSignal";
46
46
  import { verifyHandle, submitParams, FLOW_STATUS_V2, getTag, currentUserHasOperatorAuth, CANNOT_BACK_FILL } from "./common";
47
47
  import { saveWorkOrder, submitWorkOrder, addRemark, stopWorkOrder, closeWorkOrder, startWorkOrder, forwardWorkOrder, returnWorkOrder, withDrawWorkOrder, reminder, cancelReminder } from "../model/flowTemplateDetail/api";
48
- import RenderDetail from "./components/RenderDetail";
49
48
  import { COMPONENT_MAP } from "../common/utils/tools";
49
+ import RenderDetail from "./components/RenderDetail";
50
50
  import { orderDetail } from "../model/servers/api";
51
51
  import cache from "../common/cache";
52
52
  import "./index.less";
@@ -520,7 +520,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
520
520
  var handleAction = function handleAction(status) {
521
521
  //保存和提交校验重复订单禁止提交规则
522
522
  var isReplace = checkOnlySubmit();
523
- if (isReplace) {
523
+ if (isReplace && ['save', 'submit'].includes(status)) {
524
524
  return message.error('重复订单无法提交');
525
525
  }
526
526
  // return;
@@ -995,11 +995,20 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
995
995
  dispatch(setPlat(plat));
996
996
  }, [plat]);
997
997
  useEffect(function () {
998
- var _currentNodeDetail$wo24;
999
- if (autoSubmit && !isNull(currentNodeDetail) && flowWorkOrderId === (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo24 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo24 === void 0 ? void 0 : _currentNodeDetail$wo24.flowWorkOrderId)) {
1000
- setTimeout(function () {
1001
- handleSubmit();
1002
- }, 0);
998
+ if (autoSubmit && !isNull(currentNodeDetail)) {
999
+ var _currentNodeDetail$wo24;
1000
+ // TODO: 兼容后端一些时候生成的数据异常情况，防止批量提交出现卡顿不执行情况
1001
+ if (isEmpty(currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrder) && typeof callbackAutoSubmitResult === 'function') {
1002
+ return callbackAutoSubmitResult({
1003
+ success: false,
1004
+ message: "当前流程工单无工单数据,请联系实施处理"
1005
+ });
1006
+ }
1007
+ if (flowWorkOrderId === (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo24 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo24 === void 0 ? void 0 : _currentNodeDetail$wo24.flowWorkOrderId)) {
1008
+ setTimeout(function () {
1009
+ handleSubmit();
1010
+ }, 0);
1011
+ }
1003
1012
  }
1004
1013
  }, [currentNodeDetail]);
1005
1014
  var isCurrentNodeHandler = useMemo(function () {
package/dist/esm/common/utils/tools.js CHANGED
@@ -459,12 +459,6 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
459
459
  content: get(nowData, "".concat(item.uniqueKey, ".postingAddress[2]"), ''),
460
460
  name: item.name
461
461
  });
462
- } else if (item.workOrderComponentType === 'SUBFORM') {
463
- contentVoList.push({
464
- uniqueKey: "".concat(item.uniqueKey, "_productList"),
465
- content: get(nowData, "".concat(item.uniqueKey), []),
466
- name: item.name
467
- });
468
462
  } else if (item.workOrderComponentType === 'ITEM_SELECT') {
469
463
  contentVoList.push({
470
464
  uniqueKey: "".concat(item.uniqueKey, "_itemList"),
@@ -1301,38 +1295,36 @@ var transDataSource = function transDataSource(templateColumns) {
1301
1295
  address: _address2,
1302
1296
  detail: item.jsonMap["".concat(nex.uniqueKey, "_address")]
1303
1297
  }));
1304
- } else if (nex.workOrderComponentType === 'SUBFORM') {
1305
- return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_productList")], [])));
1306
1298
  } else if (nex.workOrderComponentType === 'EXPRESS_LOGISTICS_SELECT') {
1307
- var _objectSpread21;
1308
- return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread21 = {}, _defineProperty(_objectSpread21, "".concat(nex.uniqueKey), {
1299
+ var _objectSpread20;
1300
+ return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread20 = {}, _defineProperty(_objectSpread20, "".concat(nex.uniqueKey), {
1309
1301
  company: item.jsonMap["".concat(nex.uniqueKey, "_expressLogisticsCompany")],
1310
1302
  order: item.jsonMap["".concat(nex.uniqueKey, "_expressLogisticsCode")]
1311
- }), _defineProperty(_objectSpread21, "".concat(nex.uniqueKey, "_expressLogisticsCompany"), item.jsonMap["".concat(nex.uniqueKey, "_expressLogisticsCompany")]), _defineProperty(_objectSpread21, "".concat(nex.uniqueKey, "_expressLogisticsCode"), item.jsonMap["".concat(nex.uniqueKey, "_expressLogisticsCode")]), _objectSpread21));
1303
+ }), _defineProperty(_objectSpread20, "".concat(nex.uniqueKey, "_expressLogisticsCompany"), item.jsonMap["".concat(nex.uniqueKey, "_expressLogisticsCompany")]), _defineProperty(_objectSpread20, "".concat(nex.uniqueKey, "_expressLogisticsCode"), item.jsonMap["".concat(nex.uniqueKey, "_expressLogisticsCode")]), _objectSpread20));
1312
1304
  } else if (nex.workOrderComponentType === 'RETURN_LOGISTICS_SELECT') {
1313
- var _objectSpread22;
1314
- return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread22 = {}, _defineProperty(_objectSpread22, "".concat(nex.uniqueKey), {
1305
+ var _objectSpread21;
1306
+ return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread21 = {}, _defineProperty(_objectSpread21, "".concat(nex.uniqueKey), {
1315
1307
  company: item.jsonMap["".concat(nex.uniqueKey, "_returnLogisticsCompany")],
1316
1308
  order: item.jsonMap["".concat(nex.uniqueKey, "_returnLogisticsCode")]
1317
- }), _defineProperty(_objectSpread22, "".concat(nex.uniqueKey, "_returnLogisticsCompany"), item.jsonMap["".concat(nex.uniqueKey, "_returnLogisticsCompany")]), _defineProperty(_objectSpread22, "".concat(nex.uniqueKey, "_returnLogisticsCode"), item.jsonMap["".concat(nex.uniqueKey, "_returnLogisticsCode")]), _objectSpread22));
1309
+ }), _defineProperty(_objectSpread21, "".concat(nex.uniqueKey, "_returnLogisticsCompany"), item.jsonMap["".concat(nex.uniqueKey, "_returnLogisticsCompany")]), _defineProperty(_objectSpread21, "".concat(nex.uniqueKey, "_returnLogisticsCode"), item.jsonMap["".concat(nex.uniqueKey, "_returnLogisticsCode")]), _objectSpread21));
1318
1310
  } else if (nex.workOrderComponentType === 'REMARK_INPUT') {
1319
1311
  return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), {
1320
1312
  flag: item.jsonMap["".concat(nex.uniqueKey, "_flag")] ? +item.jsonMap["".concat(nex.uniqueKey, "_flag")] : config !== null && config !== void 0 && config.flag ? +(config === null || config === void 0 ? void 0 : config.flag) : '',
1321
1313
  remark: item.jsonMap["".concat(nex.uniqueKey, "_remark")] || (config === null || config === void 0 ? void 0 : config.remark) || ''
1322
1314
  }));
1323
1315
  } else if (nex.workOrderComponentType === 'STATUS') {
1324
- var _objectSpread24;
1325
- return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread24 = {}, _defineProperty(_objectSpread24, "".concat(nex.uniqueKey), {
1316
+ var _objectSpread23;
1317
+ return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread23 = {}, _defineProperty(_objectSpread23, "".concat(nex.uniqueKey), {
1326
1318
  status: item.jsonMap["".concat(nex.uniqueKey, "_status")] || (config === null || config === void 0 ? void 0 : config.status),
1327
1319
  customerService: jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_customerService")], item.jsonMap["".concat(nex.uniqueKey, "_customerService")])
1328
- }), _defineProperty(_objectSpread24, "".concat(nex.uniqueKey, "_processTime"), item.jsonMap['processTime']), _defineProperty(_objectSpread24, "".concat(nex.uniqueKey, "_lastProcessingTime"), item.jsonMap['lastProcessingTime']), _objectSpread24));
1320
+ }), _defineProperty(_objectSpread23, "".concat(nex.uniqueKey, "_processTime"), item.jsonMap['processTime']), _defineProperty(_objectSpread23, "".concat(nex.uniqueKey, "_lastProcessingTime"), item.jsonMap['lastProcessingTime']), _objectSpread23));
1329
1321
  } else if (nex.workOrderComponentType === 'ORDINARY_INVOICE') {
1330
- var _objectSpread25;
1331
- return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread25 = {}, _defineProperty(_objectSpread25, "".concat(nex.uniqueKey), {
1322
+ var _objectSpread24;
1323
+ return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread24 = {}, _defineProperty(_objectSpread24, "".concat(nex.uniqueKey), {
1332
1324
  ordinaryMoney: item.jsonMap["".concat(nex.uniqueKey, "_ordinaryMoney")],
1333
1325
  ordinarySerial: item.jsonMap["".concat(nex.uniqueKey, "_ordinarySerial")],
1334
1326
  ordinaryTaitou: item.jsonMap["".concat(nex.uniqueKey, "_ordinaryTaitou")]
1335
- }), _defineProperty(_objectSpread25, "".concat(nex.uniqueKey, "_ordinaryMoney"), item.jsonMap["".concat(nex.uniqueKey, "_ordinaryMoney")] ? Number(item.jsonMap["".concat(nex.uniqueKey, "_ordinaryMoney")]).toFixed(2) : null), _defineProperty(_objectSpread25, "".concat(nex.uniqueKey, "_ordinarySerial"), item.jsonMap["".concat(nex.uniqueKey, "_ordinarySerial")]), _defineProperty(_objectSpread25, "".concat(nex.uniqueKey, "_ordinaryTaitou"), item.jsonMap["".concat(nex.uniqueKey, "_ordinaryTaitou")]), _objectSpread25));
1327
+ }), _defineProperty(_objectSpread24, "".concat(nex.uniqueKey, "_ordinaryMoney"), item.jsonMap["".concat(nex.uniqueKey, "_ordinaryMoney")] ? Number(item.jsonMap["".concat(nex.uniqueKey, "_ordinaryMoney")]).toFixed(2) : null), _defineProperty(_objectSpread24, "".concat(nex.uniqueKey, "_ordinarySerial"), item.jsonMap["".concat(nex.uniqueKey, "_ordinarySerial")]), _defineProperty(_objectSpread24, "".concat(nex.uniqueKey, "_ordinaryTaitou"), item.jsonMap["".concat(nex.uniqueKey, "_ordinaryTaitou")]), _objectSpread24));
1336
1328
  } else if (nex.workOrderComponentType === 'LOGISTICS_INTERCEPTION') {
1337
1329
  var _address3 = [transTextToNumber(item.jsonMap["".concat(nex.uniqueKey, "_interceptProvince")]), transTextToNumber(item.jsonMap["".concat(nex.uniqueKey, "_interceptCity")])];
1338
1330
  //兼容地址是只有省市的
@@ -1380,8 +1372,8 @@ var transDataSource = function transDataSource(templateColumns) {
1380
1372
  });
1381
1373
  return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), _itemList));
1382
1374
  } else if (nex.workOrderComponentType === 'ENTERPRISE_PAYMENT') {
1383
- var _objectSpread34;
1384
- return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread34 = {}, _defineProperty(_objectSpread34, "".concat(nex.uniqueKey), {
1375
+ var _objectSpread33;
1376
+ return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread33 = {}, _defineProperty(_objectSpread33, "".concat(nex.uniqueKey), {
1385
1377
  enterprisePaymentAlipayNick: item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentAlipayNick")],
1386
1378
  enterprisePaymentAlipayNo: item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentAlipayNo")],
1387
1379
  enterprisePaymentBuyerNick: item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentBuyerNick")],
@@ -1389,7 +1381,7 @@ var transDataSource = function transDataSource(templateColumns) {
1389
1381
  enterprisePaymentRefundFee: item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentRefundFee")],
1390
1382
  enterprisePaymentStatus: item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentStatus")],
1391
1383
  enterprisePaymentTid: item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentTid")]
1392
- }), _defineProperty(_objectSpread34, "".concat(nex.uniqueKey, "_enterprisePaymentAlipayNick"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentAlipayNick")]), _defineProperty(_objectSpread34, "".concat(nex.uniqueKey, "_enterprisePaymentAlipayNo"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentAlipayNo")]), _defineProperty(_objectSpread34, "".concat(nex.uniqueKey, "_enterprisePaymentBuyerNick"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentBuyerNick")]), _defineProperty(_objectSpread34, "".concat(nex.uniqueKey, "_enterprisePaymentRefundFee"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentRefundFee")]), _defineProperty(_objectSpread34, "".concat(nex.uniqueKey, "_enterprisePaymentStatus"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentStatus")]), _defineProperty(_objectSpread34, "".concat(nex.uniqueKey, "_enterprisePaymentTime"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentTime")]), _defineProperty(_objectSpread34, "".concat(nex.uniqueKey, "_enterprisePaymentTid"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentTid")]), _objectSpread34));
1384
+ }), _defineProperty(_objectSpread33, "".concat(nex.uniqueKey, "_enterprisePaymentAlipayNick"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentAlipayNick")]), _defineProperty(_objectSpread33, "".concat(nex.uniqueKey, "_enterprisePaymentAlipayNo"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentAlipayNo")]), _defineProperty(_objectSpread33, "".concat(nex.uniqueKey, "_enterprisePaymentBuyerNick"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentBuyerNick")]), _defineProperty(_objectSpread33, "".concat(nex.uniqueKey, "_enterprisePaymentRefundFee"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentRefundFee")]), _defineProperty(_objectSpread33, "".concat(nex.uniqueKey, "_enterprisePaymentStatus"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentStatus")]), _defineProperty(_objectSpread33, "".concat(nex.uniqueKey, "_enterprisePaymentTime"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentTime")]), _defineProperty(_objectSpread33, "".concat(nex.uniqueKey, "_enterprisePaymentTid"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentTid")]), _objectSpread33));
1393
1385
  } else if (nex.workOrderComponentType === 'JST_LOGISTICS') {
1394
1386
  var _itemList2 = jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_jstItemList")], [{
1395
1387
  logisticsCompany: null,
@@ -1666,8 +1658,8 @@ var transDataSource = function transDataSource(templateColumns) {
1666
1658
  wdtSystemOrderNo: item.jsonMap["".concat(nex.uniqueKey, "_wdtSystemOrderNo")]
1667
1659
  }));
1668
1660
  } else if (nex.workOrderComponentType === 'LABEL') {
1669
- var _objectSpread56;
1670
- return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread56 = {}, _defineProperty(_objectSpread56, "".concat(nex.uniqueKey), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_label")], [])), _defineProperty(_objectSpread56, "".concat(nex.uniqueKey, "_label"), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_label")], [])), _objectSpread56));
1661
+ var _objectSpread55;
1662
+ return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread55 = {}, _defineProperty(_objectSpread55, "".concat(nex.uniqueKey), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_label")], [])), _defineProperty(_objectSpread55, "".concat(nex.uniqueKey, "_label"), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_label")], [])), _objectSpread55));
1671
1663
  } else if (nex.workOrderComponentType === 'AFTER_SALES_ORDER_ID') {
1672
1664
  return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_afterSalesOrderId")]));
1673
1665
  }
@@ -1691,7 +1683,7 @@ export var calcWorkOrderList = function calcWorkOrderList(source, templateColumn
1691
1683
  //订单返填
1692
1684
  export var orderBack = /*#__PURE__*/function () {
1693
1685
  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
1694
- var order_no, form, shopId, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, JOIN_SHOP, hasBs, hasWdt, hasWln, _ref3, shopSourceStr, _ref3$thirdUserNick, thirdUserNick, _data$value, _jstOrder$value, _jstOrder$value$data, _bsOrder$value, _wlnOrder$value, _wdtOrder$value, _bsOrders$orders, _wlnOrders$orders, _wdtOrders$trades, promise, hasJst, _yield$Promise$allSet, _yield$Promise$allSet2, data, jstOrder, bsOrder, wlnOrder, wdtOrder, orderInfo, jstInfo, bsOrders, wlnOrders, wdtOrders, bsInfo, wlnInfo, wdtInfo, formValue, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, values, _templateDetail$compo, paymentUniqueKey, cacheOrderInfo, _objectSpread59, _cacheOrderInfo;
1686
+ var order_no, form, shopId, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, JOIN_SHOP, hasBs, hasWdt, hasWln, _ref3, shopSourceStr, _ref3$thirdUserNick, thirdUserNick, _data$value, _jstOrder$value, _jstOrder$value$data, _bsOrder$value, _wlnOrder$value, _wdtOrder$value, _bsOrders$orders, _wlnOrders$orders, _wdtOrders$trades, promise, hasJst, _yield$Promise$allSet, _yield$Promise$allSet2, data, jstOrder, bsOrder, wlnOrder, wdtOrder, orderInfo, jstInfo, bsOrders, wlnOrders, wdtOrders, bsInfo, wlnInfo, wdtInfo, formValue, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, values, _templateDetail$compo, paymentUniqueKey, cacheOrderInfo, _objectSpread58, _cacheOrderInfo;
1695
1687
  return _regeneratorRuntime().wrap(function _callee$(_context) {
1696
1688
  while (1) switch (_context.prev = _context.next) {
1697
1689
  case 0:
@@ -1933,7 +1925,7 @@ export var orderBack = /*#__PURE__*/function () {
1933
1925
  sessionStorage.setItem('cacheOmsOrderInfo', JSON.stringify(_objectSpread(_objectSpread({}, cacheOrderInfo), {}, _defineProperty({}, "".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId), _defineProperty({}, plat === null || plat === void 0 ? void 0 : plat.subOrderNo, _objectSpread(_objectSpread({}, formValue), values))))));
1934
1926
  } else {
1935
1927
  _cacheOrderInfo = JSON.parse(sessionStorage.getItem('cacheOrderInfo') || '{}');
1936
- sessionStorage.setItem('cacheOrderInfo', JSON.stringify(_objectSpread(_objectSpread({}, _cacheOrderInfo), {}, (_objectSpread59 = {}, _defineProperty(_objectSpread59, order_no, values), _defineProperty(_objectSpread59, "".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId), _defineProperty({}, order_no, _objectSpread(_objectSpread({}, formValue), values))), _objectSpread59))));
1928
+ sessionStorage.setItem('cacheOrderInfo', JSON.stringify(_objectSpread(_objectSpread({}, _cacheOrderInfo), {}, (_objectSpread58 = {}, _defineProperty(_objectSpread58, order_no, values), _defineProperty(_objectSpread58, "".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId), _defineProperty({}, order_no, _objectSpread(_objectSpread({}, formValue), values))), _objectSpread58))));
1937
1929
  }
1938
1930
  }
1939
1931
  // console.log('orderback', values);
package/dist/esm/index.d.ts CHANGED
@@ -5,8 +5,8 @@ export { default as FormRender } from './FormRender';
5
5
  export { default as FormRenderTemplateId } from './FormRenderTemplateId';
6
6
  export { default as FlowWorkOrderDetail } from './FlowTemplateDetail';
7
7
  export { default as TradeList } from './TradeList';
8
- export { default as FlowFormRender } from './FlowTemplateDetail/components/FormRender';
9
8
  export { default as WdtTradeList } from './WdtTradeList';
9
+ export { default as FlowFormRender } from './FlowTemplateDetail/components/FormRender';
10
10
  export * as utils from './common/utils/tools';
11
11
  export * as arithmetic from './common/utils/arithmetic';
12
12
  export * from './WorkOrder/types';
package/dist/esm/index.js CHANGED
@@ -15,8 +15,8 @@ export { default as FormRender } from "./FormRender";
15
15
  export { default as FormRenderTemplateId } from "./FormRenderTemplateId";
16
16
  export { default as FlowWorkOrderDetail } from "./FlowTemplateDetail";
17
17
  export { default as TradeList } from "./TradeList";
18
- export { default as FlowFormRender } from "./FlowTemplateDetail/components/FormRender";
19
18
  export { default as WdtTradeList } from "./WdtTradeList";
19
+ export { default as FlowFormRender } from "./FlowTemplateDetail/components/FormRender";
20
20
  import * as _utils from "./common/utils/tools";
21
21
  export { _utils as utils };
22
22
  import * as _arithmetic from "./common/utils/arithmetic";
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
3
- "version": "1.6.0-beta.8",
3
+ "version": "1.6.1",
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": "1.6.0-beta.8",
36
- "@kmkf-fe-packages/kmkf-utils": "1.6.0-beta.0",
37
- "@kmkf-fe-packages/services-components": "1.6.0-beta.8",
35
+ "@kmkf-fe-packages/basic-components": "1.6.1",
36
+ "@kmkf-fe-packages/kmkf-utils": "1.6.1",
37
+ "@kmkf-fe-packages/services-components": "1.6.1",
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": "aed67694931e1a241ff4b4a2a7ee719aad5e05d5",
76
+ "gitHead": "6012d491910b54eb0ad306be7ddfc340ab2f5fa5",
77
77
  "gitHooks": {
78
78
  "pre-commit": "lint-staged"
79
79
  }