@kmkf-fe-packages/kmkf-work-order-service-component 1.6.1 → 1.8.0-beta.0

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 (11) hide show
  1. package/README.md +2 -1
  2. package/dist/esm/FlowTemplateDetail/components/FormRender/index.js +45 -8
  3. package/dist/esm/FlowTemplateDetail/index.js +7 -5
  4. package/dist/esm/WorkOrder/components/WorkOrderList/index.js +2 -1
  5. package/dist/esm/WorkOrder/index.js +7 -1
  6. package/dist/esm/common/utils/tools.js +27 -19
  7. package/dist/esm/index.d.ts +1 -1
  8. package/dist/esm/index.js +1 -1
  9. package/dist/esm/model/servers/request.d.ts +1 -1
  10. package/dist/esm/model/servers/request.js +1 -1
  11. package/package.json +5 -5
package/README.md CHANGED
@@ -63,4 +63,5 @@ 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 |
67
+
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 } from "../../../common/utils/tools";
31
+ INNER_REPLACE_COMPONENT, reversalFormValues, bsSystemOrderBackValues, wlnSystemOrderBackValues, getMappingConfigByTemplateDetail, wdtSystemOrderBackValues, setLogisticsInfo, COMPONENT_MAP } 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] && ((_params$key = params[key]) === null || _params$key === void 0 ? void 0 : _params$key.indexOf('*')) > -1) {
197
+ if (params[key] && typeof params[key] === 'string' && ((_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,8 +460,45 @@ 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
+ };
463
493
  useEffect(function () {
464
- if (isErpUse) return;
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
+ }
465
502
  queryDetail({
466
503
  workOrderId: workOrderId,
467
504
  shopId: shopId,
@@ -471,7 +508,7 @@ var FormRender = function FormRender(props, ref) {
471
508
  buyerId: buyerId,
472
509
  buyerNick: buyerNick
473
510
  });
474
- }, [workOrderId, record, shopId, isErpUse]);
511
+ }, [workOrderId, record, shopId, isErpUse, templateDetail]);
475
512
 
476
513
  // 重置映射隐藏的组件, 目前只有单选、下拉组件可能会因为映射关系隐藏
477
514
  var resetMappdingHideComponents = function resetMappdingHideComponents() {
@@ -502,8 +539,8 @@ var FormRender = function FormRender(props, ref) {
502
539
 
503
540
  // 批量映射
504
541
  var batchFillByMapping = function batchFillByMapping(values) {
505
- for (var _key in values) {
506
- fillByMapping(_key, values[_key]);
542
+ for (var _key2 in values) {
543
+ fillByMapping(_key2, values[_key2]);
507
544
  }
508
545
  };
509
546
  // 组件映射
@@ -516,8 +553,8 @@ var FormRender = function FormRender(props, ref) {
516
553
  form.setFieldsValue(mapping === null || mapping === void 0 ? void 0 : mapping[triggerValue]);
517
554
  } else {
518
555
  var resetSet = new Set();
519
- for (var _key2 in mapping) {
520
- for (var uniqueKey in mapping[_key2]) {
556
+ for (var _key3 in mapping) {
557
+ for (var uniqueKey in mapping[_key3]) {
521
558
  resetSet.add(uniqueKey);
522
559
  }
523
560
  }
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 { COMPONENT_MAP } from "../common/utils/tools";
49
48
  import RenderDetail from "./components/RenderDetail";
49
+ import { COMPONENT_MAP } from "../common/utils/tools";
50
50
  import { orderDetail } from "../model/servers/api";
51
51
  import cache from "../common/cache";
52
52
  import "./index.less";
@@ -574,7 +574,8 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
574
574
  _context5.next = 3;
575
575
  return addRemark(_objectSpread(_objectSpread({}, formData), {}, {
576
576
  operateParams: _objectSpread(_objectSpread({}, operateParams), {}, {
577
- flowWorkOrderId: flowWorkOrderIdState
577
+ flowWorkOrderId: flowWorkOrderIdState,
578
+ flowTemplateId: flowTemplateId
578
579
  })
579
580
  }));
580
581
  case 3:
@@ -956,11 +957,12 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
956
957
  // 填充表单
957
958
  var handleFillWorkOrder = function handleFillWorkOrder(details) {
958
959
  var _currentNodeRef$curre2, _currentNodeRef$curre3;
959
- //返填去掉店铺返填，防止端上覆盖店铺信息
960
+ //端上返填去掉店铺返填，防止端上覆盖店铺信息
960
961
  var shopId = details.shopId,
961
962
  ohter = _objectWithoutProperties(details, _excluded);
962
963
  var formData = form.getFieldsValue();
963
- form.setFieldsValue(_objectSpread(_objectSpread({}, formData), ohter));
964
+ var params = plat.platform === 'pc' ? _objectSpread(_objectSpread({}, formData), details) : _objectSpread(_objectSpread({}, formData), ohter);
965
+ form.setFieldsValue(params);
964
966
  message.success('填充成功');
965
967
  // 填充表单后触发映射
966
968
  (_currentNodeRef$curre2 = currentNodeRef.current) === null || _currentNodeRef$curre2 === void 0 ? void 0 : (_currentNodeRef$curre3 = _currentNodeRef$curre2.batchFillByMapping) === null || _currentNodeRef$curre3 === void 0 ? void 0 : _currentNodeRef$curre3.call(_currentNodeRef$curre2, form.getFieldsValue());
@@ -1001,7 +1003,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
1001
1003
  if (isEmpty(currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrder) && typeof callbackAutoSubmitResult === 'function') {
1002
1004
  return callbackAutoSubmitResult({
1003
1005
  success: false,
1004
- message: "当前流程工单无工单数据,请联系实施处理"
1006
+ message: '当前流程工单无工单数据,请联系实施处理'
1005
1007
  });
1006
1008
  }
1007
1009
  if (flowWorkOrderId === (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo24 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo24 === void 0 ? void 0 : _currentNodeDetail$wo24.flowWorkOrderId)) {
package/dist/esm/WorkOrder/components/WorkOrderList/index.js CHANGED
@@ -73,7 +73,8 @@ var getTableData = function getTableData(_ref) {
73
73
  params.shopUniqueKey = shopUniqueKey;
74
74
  }
75
75
  params.flowTemplateKey = formData !== null && formData !== void 0 && (_formData$flowTemplat = formData.flowTemplateKey) !== null && _formData$flowTemplat !== void 0 && _formData$flowTemplat.length ? formData === null || formData === void 0 ? void 0 : formData.flowTemplateKey[1] : undefined;
76
- console.log(params);
76
+ // console.log(params);
77
+
77
78
  return queryAllWorkOrderList('/qy/flow/queryFlowWorkOrders', _objectSpread(_objectSpread({}, params), {}, {
78
79
  pageSize: pageSize,
79
80
  pageNo: pageNo,
package/dist/esm/WorkOrder/index.js CHANGED
@@ -15,7 +15,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
15
15
  * Copyright (c) 2022 by wangzhenggui jianjia.wzg@raycloud.com, All Rights Reserved.
16
16
  */
17
17
  import React, { useState, useEffect, useLayoutEffect, useMemo } from 'react';
18
- import { Spin, ConfigProvider, Radio } from 'antd';
18
+ import { Spin, ConfigProvider, Radio, message } from 'antd';
19
19
  import { Provider } from 'react-redux';
20
20
  import { useAppSelector, useAppDispatch } from "../model/hooks";
21
21
  import { fetchQueryCurrentCompanyUser } from "../model/workOrder";
@@ -31,6 +31,12 @@ import zhCN from 'antd/es/locale/zh_CN';
31
31
  import 'moment/locale/zh-cn';
32
32
  import { PlatForm } from "./types";
33
33
  import "./index.less";
34
+ message.config({
35
+ top: 50,
36
+ duration: 2,
37
+ maxCount: 1,
38
+ rtl: false
39
+ });
34
40
  var WorkOrder = function WorkOrder(props) {
35
41
  var _companyUserConfig, _companyUserConfig$pd, _companyUserConfig2, _companyUserConfig2$p, _companyUserConfig2$p2;
36
42
  var platform = props.platform,
package/dist/esm/common/utils/tools.js CHANGED
@@ -459,6 +459,12 @@ 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
+ });
462
468
  } else if (item.workOrderComponentType === 'ITEM_SELECT') {
463
469
  contentVoList.push({
464
470
  uniqueKey: "".concat(item.uniqueKey, "_itemList"),
@@ -1295,36 +1301,38 @@ var transDataSource = function transDataSource(templateColumns) {
1295
1301
  address: _address2,
1296
1302
  detail: item.jsonMap["".concat(nex.uniqueKey, "_address")]
1297
1303
  }));
1304
+ } else if (nex.workOrderComponentType === 'SUBFORM') {
1305
+ return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_productList")], [])));
1298
1306
  } else if (nex.workOrderComponentType === 'EXPRESS_LOGISTICS_SELECT') {
1299
- var _objectSpread20;
1300
- return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread20 = {}, _defineProperty(_objectSpread20, "".concat(nex.uniqueKey), {
1307
+ var _objectSpread21;
1308
+ return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread21 = {}, _defineProperty(_objectSpread21, "".concat(nex.uniqueKey), {
1301
1309
  company: item.jsonMap["".concat(nex.uniqueKey, "_expressLogisticsCompany")],
1302
1310
  order: item.jsonMap["".concat(nex.uniqueKey, "_expressLogisticsCode")]
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));
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));
1304
1312
  } else if (nex.workOrderComponentType === 'RETURN_LOGISTICS_SELECT') {
1305
- var _objectSpread21;
1306
- return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread21 = {}, _defineProperty(_objectSpread21, "".concat(nex.uniqueKey), {
1313
+ var _objectSpread22;
1314
+ return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread22 = {}, _defineProperty(_objectSpread22, "".concat(nex.uniqueKey), {
1307
1315
  company: item.jsonMap["".concat(nex.uniqueKey, "_returnLogisticsCompany")],
1308
1316
  order: item.jsonMap["".concat(nex.uniqueKey, "_returnLogisticsCode")]
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));
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));
1310
1318
  } else if (nex.workOrderComponentType === 'REMARK_INPUT') {
1311
1319
  return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), {
1312
1320
  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) : '',
1313
1321
  remark: item.jsonMap["".concat(nex.uniqueKey, "_remark")] || (config === null || config === void 0 ? void 0 : config.remark) || ''
1314
1322
  }));
1315
1323
  } else if (nex.workOrderComponentType === 'STATUS') {
1316
- var _objectSpread23;
1317
- return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread23 = {}, _defineProperty(_objectSpread23, "".concat(nex.uniqueKey), {
1324
+ var _objectSpread24;
1325
+ return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread24 = {}, _defineProperty(_objectSpread24, "".concat(nex.uniqueKey), {
1318
1326
  status: item.jsonMap["".concat(nex.uniqueKey, "_status")] || (config === null || config === void 0 ? void 0 : config.status),
1319
1327
  customerService: jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_customerService")], item.jsonMap["".concat(nex.uniqueKey, "_customerService")])
1320
- }), _defineProperty(_objectSpread23, "".concat(nex.uniqueKey, "_processTime"), item.jsonMap['processTime']), _defineProperty(_objectSpread23, "".concat(nex.uniqueKey, "_lastProcessingTime"), item.jsonMap['lastProcessingTime']), _objectSpread23));
1328
+ }), _defineProperty(_objectSpread24, "".concat(nex.uniqueKey, "_processTime"), item.jsonMap['processTime']), _defineProperty(_objectSpread24, "".concat(nex.uniqueKey, "_lastProcessingTime"), item.jsonMap['lastProcessingTime']), _objectSpread24));
1321
1329
  } else if (nex.workOrderComponentType === 'ORDINARY_INVOICE') {
1322
- var _objectSpread24;
1323
- return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread24 = {}, _defineProperty(_objectSpread24, "".concat(nex.uniqueKey), {
1330
+ var _objectSpread25;
1331
+ return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread25 = {}, _defineProperty(_objectSpread25, "".concat(nex.uniqueKey), {
1324
1332
  ordinaryMoney: item.jsonMap["".concat(nex.uniqueKey, "_ordinaryMoney")],
1325
1333
  ordinarySerial: item.jsonMap["".concat(nex.uniqueKey, "_ordinarySerial")],
1326
1334
  ordinaryTaitou: item.jsonMap["".concat(nex.uniqueKey, "_ordinaryTaitou")]
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));
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));
1328
1336
  } else if (nex.workOrderComponentType === 'LOGISTICS_INTERCEPTION') {
1329
1337
  var _address3 = [transTextToNumber(item.jsonMap["".concat(nex.uniqueKey, "_interceptProvince")]), transTextToNumber(item.jsonMap["".concat(nex.uniqueKey, "_interceptCity")])];
1330
1338
  //兼容地址是只有省市的
@@ -1372,8 +1380,8 @@ var transDataSource = function transDataSource(templateColumns) {
1372
1380
  });
1373
1381
  return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), _itemList));
1374
1382
  } else if (nex.workOrderComponentType === 'ENTERPRISE_PAYMENT') {
1375
- var _objectSpread33;
1376
- return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread33 = {}, _defineProperty(_objectSpread33, "".concat(nex.uniqueKey), {
1383
+ var _objectSpread34;
1384
+ return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread34 = {}, _defineProperty(_objectSpread34, "".concat(nex.uniqueKey), {
1377
1385
  enterprisePaymentAlipayNick: item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentAlipayNick")],
1378
1386
  enterprisePaymentAlipayNo: item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentAlipayNo")],
1379
1387
  enterprisePaymentBuyerNick: item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentBuyerNick")],
@@ -1381,7 +1389,7 @@ var transDataSource = function transDataSource(templateColumns) {
1381
1389
  enterprisePaymentRefundFee: item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentRefundFee")],
1382
1390
  enterprisePaymentStatus: item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentStatus")],
1383
1391
  enterprisePaymentTid: item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentTid")]
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));
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));
1385
1393
  } else if (nex.workOrderComponentType === 'JST_LOGISTICS') {
1386
1394
  var _itemList2 = jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_jstItemList")], [{
1387
1395
  logisticsCompany: null,
@@ -1658,8 +1666,8 @@ var transDataSource = function transDataSource(templateColumns) {
1658
1666
  wdtSystemOrderNo: item.jsonMap["".concat(nex.uniqueKey, "_wdtSystemOrderNo")]
1659
1667
  }));
1660
1668
  } else if (nex.workOrderComponentType === 'LABEL') {
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));
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));
1663
1671
  } else if (nex.workOrderComponentType === 'AFTER_SALES_ORDER_ID') {
1664
1672
  return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_afterSalesOrderId")]));
1665
1673
  }
@@ -1683,7 +1691,7 @@ export var calcWorkOrderList = function calcWorkOrderList(source, templateColumn
1683
1691
  //订单返填
1684
1692
  export var orderBack = /*#__PURE__*/function () {
1685
1693
  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
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;
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;
1687
1695
  return _regeneratorRuntime().wrap(function _callee$(_context) {
1688
1696
  while (1) switch (_context.prev = _context.next) {
1689
1697
  case 0:
@@ -1925,7 +1933,7 @@ export var orderBack = /*#__PURE__*/function () {
1925
1933
  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))))));
1926
1934
  } else {
1927
1935
  _cacheOrderInfo = JSON.parse(sessionStorage.getItem('cacheOrderInfo') || '{}');
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))));
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))));
1929
1937
  }
1930
1938
  }
1931
1939
  // 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 WdtTradeList } from './WdtTradeList';
9
8
  export { default as FlowFormRender } from './FlowTemplateDetail/components/FormRender';
9
+ export { default as WdtTradeList } from './WdtTradeList';
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 WdtTradeList } from "./WdtTradeList";
19
18
  export { default as FlowFormRender } from "./FlowTemplateDetail/components/FormRender";
19
+ export { default as WdtTradeList } from "./WdtTradeList";
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/dist/esm/model/servers/request.d.ts CHANGED
@@ -13,5 +13,5 @@ export interface serverProps<T = any> {
13
13
  traceId: string;
14
14
  [key: string]: any;
15
15
  }
16
- declare const requestApi: <T = any>({ url, method, data, headers, infoLevel, options }: RequestProps) => Promise<serverProps<T>>;
16
+ declare const requestApi: <T = any>({ url, method, data, headers, infoLevel, options, }: RequestProps) => Promise<serverProps<T>>;
17
17
  export default requestApi;
package/dist/esm/model/servers/request.js CHANGED
@@ -41,7 +41,7 @@ var requestApi = function requestApi(_ref) {
41
41
  if (infoLevel === 'warning') {
42
42
  message.warn(res.message);
43
43
  } else if (infoLevel === 'error') {
44
- message.error(res.message);
44
+ message.error("path: ".concat(url, " ").concat(res.message, " traceId: ").concat(res.traceId));
45
45
  } else {
46
46
  console.log(res.message);
47
47
  }
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.1",
3
+ "version": "1.8.0-beta.0",
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.1",
36
- "@kmkf-fe-packages/kmkf-utils": "1.6.1",
37
- "@kmkf-fe-packages/services-components": "1.6.1",
35
+ "@kmkf-fe-packages/basic-components": "1.8.0-beta.0",
36
+ "@kmkf-fe-packages/kmkf-utils": "1.8.0-beta.0",
37
+ "@kmkf-fe-packages/services-components": "1.8.0-beta.0",
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": "6012d491910b54eb0ad306be7ddfc340ab2f5fa5",
76
+ "gitHead": "b854b2c34a9d25d96f0484f45aa15d4d7b5eb958",
77
77
  "gitHooks": {
78
78
  "pre-commit": "lint-staged"
79
79
  }