@kmkf-fe-packages/kmkf-work-order-service-component 1.4.0-rc.2 → 1.4.2
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.
- package/README.md +2 -1
- package/dist/esm/FlowTemplateDetail/components/FormRender/index.js +40 -57
- package/dist/esm/FlowTemplateDetail/index.d.ts +1 -0
- package/dist/esm/FlowTemplateDetail/index.js +2 -1
- package/dist/esm/common/utils/tools.js +55 -109
- package/dist/esm/model/logicFlow/index.js +7 -6
- package/package.json +6 -6
package/README.md
CHANGED
|
@@ -38,6 +38,7 @@ Build library via `father`,
|
|
|
38
38
|
```bash
|
|
39
39
|
$ npm run build
|
|
40
40
|
```
|
|
41
|
+
|
|
41
42
|
11122
|
|
42
43
|
|
|
43
44
|
## 企业工单工单项目抽离模块
|
|
@@ -63,5 +64,5 @@ const Text = ()=>{
|
|
|
63
64
|
|
|
64
65
|
```
|
|
65
66
|
|
|
66
|
-
| 字段 | 说明 | 数据类型 | | ----------------- | ---------------- | ------------------------------------ | | platform | 平台 | TAOBAO =淘宝\|FXG=抖音\|PDD=拼多多\| | | shopId | 店铺 ID | number | | buyerNick | 买家昵称 | string | | buyerId | 买家 id | string | | orderNo | 订单 id | string | | onEmpowerCallback | 授权弹框点击回调 | function |
|
|
67
|
+
| 字段 | 说明 | 数据类型 | | ----------------- | ---------------- | ------------------------------------ | | platform | 平台 | TAOBAO =淘宝\|FXG=抖音\|PDD=拼多多\| | | shopId | 店铺 ID | number | | buyerNick | 买家昵称 | string | | buyerId | 买家 id | string | | orderNo | 订单 id | string | | onEmpowerCallback | 授权弹框点击回调 | function |
|
|
67
68
|
|
|
@@ -24,7 +24,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
|
24
24
|
import React, { useState, useRef, useEffect, useMemo, forwardRef, useImperativeHandle } from 'react';
|
|
25
25
|
import { ConfigProvider, Form, Space, Tag } from 'antd';
|
|
26
26
|
import zhCN from 'antd/es/locale/zh_CN';
|
|
27
|
-
import { get, some, set, every, cloneDeep, isEmpty, intersection, throttle
|
|
27
|
+
import { get, some, set, every, cloneDeep, isEmpty, intersection, throttle } from 'lodash';
|
|
28
28
|
import 'moment/locale/zh-cn';
|
|
29
29
|
import { calcWorkOrderList, orderBack, getReplaceWarnValues, COMPONENT_MAP_NAME, EXCLUDE_REPLACE_TOP_COMPONENT,
|
|
30
30
|
// 重复检验不需要展示在顶部的
|
|
@@ -50,7 +50,6 @@ var hasComponent = function hasComponent(componentDtoList, workOrderComponentTyp
|
|
|
50
50
|
// TODO: 用useState会有bug, 不确定是哪里导致的
|
|
51
51
|
var hideByXYComponentsMap = {};
|
|
52
52
|
var FormRender = function FormRender(props, ref) {
|
|
53
|
-
var _Object$keys2;
|
|
54
53
|
useImperativeHandle(ref, function () {
|
|
55
54
|
return {
|
|
56
55
|
batchFillByMapping: batchFillByMapping
|
|
@@ -367,11 +366,11 @@ var FormRender = function FormRender(props, ref) {
|
|
|
367
366
|
batchFillByMapping(initialValues);
|
|
368
367
|
orderBackReplace(transData, templateDetail);
|
|
369
368
|
// TODO: 非开始节点录入,都会有workOrderId,这里判断是否有前置组件含有订单号;如果存在订单号,进行订单反填。
|
|
370
|
-
var
|
|
371
|
-
if (
|
|
369
|
+
var _tradeIdUniqueKey = hasComponent(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList, 'TRADE_ID_INPUT');
|
|
370
|
+
if (_tradeIdUniqueKey && shopId && record !== null && record !== void 0 && (_record$jsonMap2 = record.jsonMap) !== null && _record$jsonMap2 !== void 0 && _record$jsonMap2["".concat(_tradeIdUniqueKey, "_tradeId")] && firstOrderBackfill) {
|
|
372
371
|
var _record$jsonMap3;
|
|
373
372
|
orderBack({
|
|
374
|
-
order_no: record === null || record === void 0 ? void 0 : (_record$jsonMap3 = record.jsonMap) === null || _record$jsonMap3 === void 0 ? void 0 : _record$jsonMap3["".concat(
|
|
373
|
+
order_no: record === null || record === void 0 ? void 0 : (_record$jsonMap3 = record.jsonMap) === null || _record$jsonMap3 === void 0 ? void 0 : _record$jsonMap3["".concat(_tradeIdUniqueKey, "_tradeId")],
|
|
375
374
|
form: form,
|
|
376
375
|
shopId: shopId,
|
|
377
376
|
shopList: shopList,
|
|
@@ -543,6 +542,20 @@ var FormRender = function FormRender(props, ref) {
|
|
|
543
542
|
fillByShopId(shopId);
|
|
544
543
|
}, [shopId]);
|
|
545
544
|
|
|
545
|
+
// TODO: 标签查询逻辑
|
|
546
|
+
var formShopId = Form.useWatch("shopId", form) || shopId;
|
|
547
|
+
var tradeIdUniqueKey = hasComponent(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, 'TRADE_ID_INPUT');
|
|
548
|
+
var labelUniqueKey = hasComponent(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, 'LABEL');
|
|
549
|
+
useEffect(function () {
|
|
550
|
+
var tid = form.getFieldValue("".concat(tradeIdUniqueKey, "_tradeId"));
|
|
551
|
+
if (!tid) {
|
|
552
|
+
setLabelList([]);
|
|
553
|
+
}
|
|
554
|
+
if (formShopId && tid && labelUniqueKey) {
|
|
555
|
+
queryLabels(tid, formShopId);
|
|
556
|
+
}
|
|
557
|
+
}, [formShopId, tradeIdUniqueKey, labelUniqueKey]);
|
|
558
|
+
|
|
546
559
|
// 查询标签
|
|
547
560
|
var queryLabels = /*#__PURE__*/function () {
|
|
548
561
|
var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(tid, shopId) {
|
|
@@ -562,26 +575,18 @@ var FormRender = function FormRender(props, ref) {
|
|
|
562
575
|
}
|
|
563
576
|
return _context2.abrupt("return", console.debug('查询标签缺少必要参数-shopId'));
|
|
564
577
|
case 4:
|
|
565
|
-
|
|
566
|
-
_context2.next = 8;
|
|
567
|
-
break;
|
|
568
|
-
}
|
|
569
|
-
setLabelList([]);
|
|
570
|
-
form.setFieldsValue(_defineProperty({}, "".concat(labelComponent.uniqueKey), []));
|
|
571
|
-
return _context2.abrupt("return", console.debug('查询标签缺少必要参数-tradeId'));
|
|
572
|
-
case 8:
|
|
573
|
-
_context2.next = 10;
|
|
578
|
+
_context2.next = 6;
|
|
574
579
|
return queryLabelByTradeId({
|
|
575
580
|
tid: tid,
|
|
576
581
|
shopId: shopId
|
|
577
582
|
});
|
|
578
|
-
case
|
|
583
|
+
case 6:
|
|
579
584
|
_yield$queryLabelByTr = _context2.sent;
|
|
580
585
|
_yield$queryLabelByTr2 = _yield$queryLabelByTr.data;
|
|
581
586
|
data = _yield$queryLabelByTr2 === void 0 ? [] : _yield$queryLabelByTr2;
|
|
582
587
|
setLabelList(data);
|
|
583
588
|
form.setFieldsValue(_defineProperty({}, "".concat(labelComponent.uniqueKey), data));
|
|
584
|
-
case
|
|
589
|
+
case 11:
|
|
585
590
|
case "end":
|
|
586
591
|
return _context2.stop();
|
|
587
592
|
}
|
|
@@ -596,6 +601,7 @@ var FormRender = function FormRender(props, ref) {
|
|
|
596
601
|
var changeHandle = function changeHandle(order_no) {
|
|
597
602
|
if (!order_no) return;
|
|
598
603
|
console.log('[订单返填 changeHandle order_no ] >', order_no);
|
|
604
|
+
queryLabels(order_no, formShopId);
|
|
599
605
|
orderBack({
|
|
600
606
|
order_no: order_no,
|
|
601
607
|
form: form,
|
|
@@ -652,28 +658,25 @@ var FormRender = function FormRender(props, ref) {
|
|
|
652
658
|
return _regeneratorRuntime().wrap(function _callee3$(_context3) {
|
|
653
659
|
while (1) switch (_context3.prev = _context3.next) {
|
|
654
660
|
case 0:
|
|
655
|
-
if (type === 'tradeId') {
|
|
656
|
-
queryLabels(value, form.getFieldValue('shopId'));
|
|
657
|
-
}
|
|
658
661
|
// 针对订单号组件进行当前订单查重校验
|
|
659
662
|
if ((type === 'tradeId' || type === 'enterprisePaymentTid') && typeof handleChangeTradeId === 'function') {
|
|
660
663
|
handleChangeTradeId(value);
|
|
661
664
|
}
|
|
662
665
|
if (value) {
|
|
663
|
-
_context3.next =
|
|
666
|
+
_context3.next = 4;
|
|
664
667
|
break;
|
|
665
668
|
}
|
|
666
669
|
setReplaceValue(function (prev) {
|
|
667
670
|
return _objectSpread(_objectSpread({}, prev), {}, _defineProperty({}, type, 0));
|
|
668
671
|
});
|
|
669
672
|
return _context3.abrupt("return");
|
|
670
|
-
case
|
|
673
|
+
case 4:
|
|
671
674
|
queryReplaceCount(_defineProperty({}, type, value), templateDetail);
|
|
672
675
|
// TODO: ERP不走订单反弹逻辑
|
|
673
676
|
if ((type === 'tradeId' || type === 'enterprisePaymentTid') && !isErpUse) {
|
|
674
677
|
changeHandle(value);
|
|
675
678
|
}
|
|
676
|
-
case
|
|
679
|
+
case 6:
|
|
677
680
|
case "end":
|
|
678
681
|
return _context3.stop();
|
|
679
682
|
}
|
|
@@ -688,7 +691,7 @@ var FormRender = function FormRender(props, ref) {
|
|
|
688
691
|
setShopId(val);
|
|
689
692
|
// 清空表单字段
|
|
690
693
|
var needClearFormFields = get(templateDetail, 'componentDtoList', []).reduce(function (cur, nxt) {
|
|
691
|
-
if (['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'
|
|
694
|
+
if (['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'].includes(nxt === null || nxt === void 0 ? void 0 : nxt.workOrderComponentType)) {
|
|
692
695
|
cur.push(nxt === null || nxt === void 0 ? void 0 : nxt.uniqueKey);
|
|
693
696
|
}
|
|
694
697
|
return cur;
|
|
@@ -726,7 +729,7 @@ var FormRender = function FormRender(props, ref) {
|
|
|
726
729
|
}
|
|
727
730
|
//如果有bs组件 设置成初始值
|
|
728
731
|
var hasBs = get(templateDetail, 'componentDtoList', []).some(function (item) {
|
|
729
|
-
return ['BS_LOGISTICS', 'BS_SEND_GOOD', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WLN_LOGISTICS', 'WLN_SEND_GOOD'
|
|
732
|
+
return ['BS_LOGISTICS', 'BS_SEND_GOOD', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WLN_LOGISTICS', 'WLN_SEND_GOOD'].includes(item.workOrderComponentType);
|
|
730
733
|
});
|
|
731
734
|
if (hasBs) {
|
|
732
735
|
var bsValue = get(templateDetail, 'componentDtoList', []).reduce(function (prv, next) {
|
|
@@ -742,7 +745,6 @@ var FormRender = function FormRender(props, ref) {
|
|
|
742
745
|
case 'BS_SEND_GOOD':
|
|
743
746
|
case 'WLN_SEND_GOOD':
|
|
744
747
|
case 'WDT_SEND_GOOD':
|
|
745
|
-
case 'KM_SEND_GOOD':
|
|
746
748
|
prv[next.uniqueKey] = [{
|
|
747
749
|
sendName: '',
|
|
748
750
|
sendId: ''
|
|
@@ -757,17 +759,13 @@ var FormRender = function FormRender(props, ref) {
|
|
|
757
759
|
var allValue = form.getFieldsValue();
|
|
758
760
|
var tradeIdUniqueKey = hasComponent(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, 'TRADE_ID_INPUT');
|
|
759
761
|
var paymentUniqueKey = hasComponent(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, 'ENTERPRISE_PAYMENT');
|
|
760
|
-
if (tradeIdUniqueKey) {
|
|
761
|
-
var tradeValue = allValue[tradeIdUniqueKey];
|
|
762
|
-
queryLabels(tradeValue, val);
|
|
763
|
-
}
|
|
764
762
|
if (tradeIdUniqueKey || paymentUniqueKey) {
|
|
765
763
|
var _allValue;
|
|
766
|
-
var
|
|
764
|
+
var tradeValue = allValue[tradeIdUniqueKey];
|
|
767
765
|
var paymentValue = (_allValue = allValue[paymentUniqueKey]) === null || _allValue === void 0 ? void 0 : _allValue.enterprisePaymentTid;
|
|
768
|
-
if (
|
|
766
|
+
if (tradeValue || paymentValue) {
|
|
769
767
|
orderBack({
|
|
770
|
-
order_no:
|
|
768
|
+
order_no: tradeValue || paymentValue,
|
|
771
769
|
form: form,
|
|
772
770
|
shopId: val,
|
|
773
771
|
shopList: shopList,
|
|
@@ -795,7 +793,7 @@ var FormRender = function FormRender(props, ref) {
|
|
|
795
793
|
});
|
|
796
794
|
};
|
|
797
795
|
var conditionItemResult = function conditionItemResult(item, getFieldValue) {
|
|
798
|
-
var _item$leftValue$split, _item$leftValue$split2,
|
|
796
|
+
var _item$leftValue$split, _item$leftValue$split2, _item$compareSymbol;
|
|
799
797
|
//现支持子组件控制显隐,格式为${uniqueKey}_${type}与普通组件做区分
|
|
800
798
|
var isChildField = item.leftValue.includes('_');
|
|
801
799
|
var prefixId = isChildField ? (_item$leftValue$split = item.leftValue.split('_')) === null || _item$leftValue$split === void 0 ? void 0 : _item$leftValue$split[0] : item.leftValue;
|
|
@@ -818,8 +816,7 @@ var FormRender = function FormRender(props, ref) {
|
|
|
818
816
|
if (Reflect.has(currentComponentDisplayStatus.current, prefixId) && !currentComponentDisplayStatus.current[prefixId]) {
|
|
819
817
|
return false;
|
|
820
818
|
}
|
|
821
|
-
|
|
822
|
-
return getExpression((_item$compareSymbol2 = item.compareSymbol) === null || _item$compareSymbol2 === void 0 ? void 0 : _item$compareSymbol2.toUpperCase(), leftValue, item.rightValue);
|
|
819
|
+
return getExpression((_item$compareSymbol = item.compareSymbol) === null || _item$compareSymbol === void 0 ? void 0 : _item$compareSymbol.toUpperCase(), leftValue, item.rightValue);
|
|
823
820
|
};
|
|
824
821
|
var getDisplayAndDisabledConfig = function getDisplayAndDisabledConfig(config) {
|
|
825
822
|
if (isNull(config)) {
|
|
@@ -837,7 +834,7 @@ var FormRender = function FormRender(props, ref) {
|
|
|
837
834
|
};
|
|
838
835
|
var newRenderColumnItem = function newRenderColumnItem(effects) {
|
|
839
836
|
return function (item) {
|
|
840
|
-
var _templateDetail$flowT2;
|
|
837
|
+
var _componentConfig$stat, _componentConfig$stat2, _templateDetail$flowT2;
|
|
841
838
|
var _item$componentConfig2 = item.componentConfig,
|
|
842
839
|
componentConfig = _item$componentConfig2 === void 0 ? {} : _item$componentConfig2,
|
|
843
840
|
workOrderComponentType = item.workOrderComponentType,
|
|
@@ -851,19 +848,7 @@ var FormRender = function FormRender(props, ref) {
|
|
|
851
848
|
var newComponentConfig = _objectSpread(_objectSpread({}, componentConfig), {}, {
|
|
852
849
|
disabled: disabled
|
|
853
850
|
});
|
|
854
|
-
var
|
|
855
|
-
upgrade = _ref5.upgrade,
|
|
856
|
-
created = _ref5.created;
|
|
857
|
-
if (['REISSUE_TRADE_ID', 'EXCHANGE_TRADE_ID'].includes(workOrderComponentType)) {
|
|
858
|
-
// 补发单id和换货单id默认值是可见不可编辑(2)
|
|
859
|
-
if (typeof upgrade !== 'number') {
|
|
860
|
-
upgrade = 2;
|
|
861
|
-
}
|
|
862
|
-
if (typeof created !== 'number') {
|
|
863
|
-
created = 2;
|
|
864
|
-
}
|
|
865
|
-
}
|
|
866
|
-
var _getDisplayAndDisable = getDisplayAndDisabledConfig(workOrderId ? upgrade : created),
|
|
851
|
+
var _getDisplayAndDisable = getDisplayAndDisabledConfig(workOrderId ? componentConfig === null || componentConfig === void 0 ? void 0 : (_componentConfig$stat = componentConfig.status) === null || _componentConfig$stat === void 0 ? void 0 : _componentConfig$stat.upgrade : componentConfig === null || componentConfig === void 0 ? void 0 : (_componentConfig$stat2 = componentConfig.status) === null || _componentConfig$stat2 === void 0 ? void 0 : _componentConfig$stat2.created),
|
|
867
852
|
componentCanEdit = _getDisplayAndDisable.disabled,
|
|
868
853
|
componentCanShow = _getDisplayAndDisable.display;
|
|
869
854
|
// TODO: 非前置节点组件渲染消费是否可以编辑配置
|
|
@@ -917,8 +902,8 @@ var FormRender = function FormRender(props, ref) {
|
|
|
917
902
|
shouldUpdate: function shouldUpdate() {
|
|
918
903
|
return true; // TODO: 修复重复依赖的问题 https://tb.raycloud.com/task/64e4491e0b8b5c001e1099b9
|
|
919
904
|
}
|
|
920
|
-
}, function (
|
|
921
|
-
var getFieldValue =
|
|
905
|
+
}, function (_ref5) {
|
|
906
|
+
var getFieldValue = _ref5.getFieldValue;
|
|
922
907
|
var show = currentIdDependenceOtherFields === null || currentIdDependenceOtherFields === void 0 ? void 0 : currentIdDependenceOtherFields.reduce(function (cur, nxt) {
|
|
923
908
|
// 如果有一项满足展示条件则展示
|
|
924
909
|
if (cur) {
|
|
@@ -1035,10 +1020,10 @@ var FormRender = function FormRender(props, ref) {
|
|
|
1035
1020
|
//如果是初始化创建工单 缓存信息
|
|
1036
1021
|
if (!workOrderId && ['fxg', 'tb', 'ks', 'xiaozhi'].includes(plat.platform)) {
|
|
1037
1022
|
var _tempLateList$find;
|
|
1038
|
-
var
|
|
1023
|
+
var _tradeIdUniqueKey2 = (_tempLateList$find = tempLateList.find(function (item) {
|
|
1039
1024
|
return item.workOrderComponentType === 'TRADE_ID_INPUT';
|
|
1040
1025
|
})) === null || _tempLateList$find === void 0 ? void 0 : _tempLateList$find.uniqueKey;
|
|
1041
|
-
var tradeId = value[
|
|
1026
|
+
var tradeId = value[_tradeIdUniqueKey2];
|
|
1042
1027
|
if (plat !== null && plat !== void 0 && plat.subOrderNo) {
|
|
1043
1028
|
var cacheOmsOrderInfo = JSON.parse(sessionStorage.getItem('cacheOmsOrderInfo') || '{}');
|
|
1044
1029
|
sessionStorage.setItem('cacheOmsOrderInfo', JSON.stringify(_objectSpread(_objectSpread({}, cacheOmsOrderInfo), {}, _defineProperty({}, "".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId), _defineProperty({}, plat === null || plat === void 0 ? void 0 : plat.subOrderNo, value)))));
|
|
@@ -1114,12 +1099,10 @@ var FormRender = function FormRender(props, ref) {
|
|
|
1114
1099
|
style: {
|
|
1115
1100
|
marginBottom: '8px'
|
|
1116
1101
|
}
|
|
1117
|
-
},
|
|
1118
|
-
return item.labelShowName;
|
|
1119
|
-
}))) === null || _Object$keys2 === void 0 ? void 0 : _Object$keys2.map(function (labelShowName) {
|
|
1102
|
+
}, labelList === null || labelList === void 0 ? void 0 : labelList.map(function (l) {
|
|
1120
1103
|
var _LabelData$getInstanc;
|
|
1121
1104
|
var label = ((_LabelData$getInstanc = LabelData.getInstance().labelData) === null || _LabelData$getInstanc === void 0 ? void 0 : _LabelData$getInstanc.find(function (item) {
|
|
1122
|
-
return item.value === labelShowName;
|
|
1105
|
+
return item.value === (l === null || l === void 0 ? void 0 : l.labelShowName);
|
|
1123
1106
|
})) || {};
|
|
1124
1107
|
if (!isNull(label)) return /*#__PURE__*/React.createElement(Tag, {
|
|
1125
1108
|
color: label === null || label === void 0 ? void 0 : label.color
|
|
@@ -7,6 +7,7 @@ declare type FlowTemplateDetailProps = {
|
|
|
7
7
|
plat: PlatFormInfo;
|
|
8
8
|
shopList: any[];
|
|
9
9
|
readonly?: boolean;
|
|
10
|
+
privilege?: boolean;
|
|
10
11
|
onOpenWangWang?: (nick: string, id: string) => void;
|
|
11
12
|
callbackDealWorkOrderSuccess?: (type: string, workOrderId?: string) => void;
|
|
12
13
|
onJumpMemoPage?: () => void;
|
|
@@ -59,6 +59,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
59
59
|
plat = props.plat,
|
|
60
60
|
_props$readonly = props.readonly,
|
|
61
61
|
readonly = _props$readonly === void 0 ? false : _props$readonly,
|
|
62
|
+
privilege = props.privilege,
|
|
62
63
|
onOpenWangWang = props.onOpenWangWang,
|
|
63
64
|
callbackDealWorkOrderSuccess = props.callbackDealWorkOrderSuccess,
|
|
64
65
|
onJumpMemoPage = props.onJumpMemoPage,
|
|
@@ -1102,7 +1103,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
1102
1103
|
}))), getTag({
|
|
1103
1104
|
nodeIsAuto: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no21 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no21 === void 0 ? void 0 : _currentNodeDetail$no21.isAuto,
|
|
1104
1105
|
nodeType: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no22 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no22 === void 0 ? void 0 : _currentNodeDetail$no22.nodeType
|
|
1105
|
-
}) === 'artificial' && (!(currentNodeDetail !== null && currentNodeDetail !== void 0 && currentNodeDetail.workOrder) || isCurrentNodeHandler) && !readonly && /*#__PURE__*/React.createElement("div", {
|
|
1106
|
+
}) === 'artificial' && (!(currentNodeDetail !== null && currentNodeDetail !== void 0 && currentNodeDetail.workOrder) || isCurrentNodeHandler || privilege) && !readonly && /*#__PURE__*/React.createElement("div", {
|
|
1106
1107
|
className: "footer"
|
|
1107
1108
|
}, /*#__PURE__*/React.createElement(ActionList, {
|
|
1108
1109
|
flowType: flowTemplateType,
|
|
@@ -21,7 +21,7 @@ import { get, every, maxBy } from 'lodash';
|
|
|
21
21
|
import V from 'voca';
|
|
22
22
|
import { orderDetail, jstOrderDetail, bsOrderDetail, wlnOrderDetail, wdtOrderDetail } from "../../model/servers/api";
|
|
23
23
|
import moment from 'moment';
|
|
24
|
-
import { AddressData, ExpressData, ExpressInterceptData, orderBackFormValues, bsOrderBackFormValues, wlnOrderBackFormValues, wdtOrderBackFormValues, findLabelBySelectValue, request, isNull, bsOrderTransform, wlnOrderTransform, wdtOrderTransform,
|
|
24
|
+
import { AddressData, ExpressData, ExpressInterceptData, orderBackFormValues, bsOrderBackFormValues, wlnOrderBackFormValues, wdtOrderBackFormValues, findLabelBySelectValue, request, isNull, bsOrderTransform, wlnOrderTransform, wdtOrderTransform, unTransField } from '@kmkf-fe-packages/kmkf-utils';
|
|
25
25
|
import { cloneDeep, isEqual, set } from 'lodash';
|
|
26
26
|
import Monitor from 'kmkf-monitor';
|
|
27
27
|
import { PlatForm } from "../../model/flowTemplateDetail/types";
|
|
@@ -775,7 +775,7 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
|
|
|
775
775
|
}),
|
|
776
776
|
name: item.name
|
|
777
777
|
});
|
|
778
|
-
} else if (['BS_SEND_GOOD', 'WLN_SEND_GOOD', 'WDT_SEND_GOOD'
|
|
778
|
+
} else if (['BS_SEND_GOOD', 'WLN_SEND_GOOD', 'WDT_SEND_GOOD'].includes(item.workOrderComponentType)) {
|
|
779
779
|
var sendGoodMap = {
|
|
780
780
|
BS_SEND_GOOD: {
|
|
781
781
|
list: 'bsSendGood',
|
|
@@ -791,11 +791,6 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
|
|
|
791
791
|
list: 'wdtSendGood',
|
|
792
792
|
id: 'wdtSendId',
|
|
793
793
|
name: 'wdtSendName'
|
|
794
|
-
},
|
|
795
|
-
KM_SEND_GOOD: {
|
|
796
|
-
list: 'kmSendGood',
|
|
797
|
-
id: 'kmSendId',
|
|
798
|
-
name: 'kmSendName'
|
|
799
794
|
}
|
|
800
795
|
};
|
|
801
796
|
var bsSendList = get(nowData, "".concat(item.uniqueKey), []);
|
|
@@ -822,17 +817,6 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
|
|
|
822
817
|
}),
|
|
823
818
|
name: item.name
|
|
824
819
|
});
|
|
825
|
-
if (item.workOrderComponentType === 'WDT_SEND_GOOD') {
|
|
826
|
-
contentVoList.push({
|
|
827
|
-
uniqueKey: "".concat(item.uniqueKey, "_sendSnapshotName"),
|
|
828
|
-
content: bsSendList.filter(function (t) {
|
|
829
|
-
return t.sendSnapshotName;
|
|
830
|
-
}).map(function (item) {
|
|
831
|
-
return item.sendSnapshotName + '';
|
|
832
|
-
}),
|
|
833
|
-
name: item.name
|
|
834
|
-
});
|
|
835
|
-
}
|
|
836
820
|
} else if (item.workOrderComponentType === 'LOGISTICS_TRAJECTORY') {
|
|
837
821
|
var logisticsTrajectoryMap = ['trajectoryCompany', 'trajectoryCode', 'trajectorySnapshot', 'trajectoryPhone'];
|
|
838
822
|
logisticsTrajectoryMap.map(function (s) {
|
|
@@ -942,18 +926,6 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
|
|
|
942
926
|
name: item.name
|
|
943
927
|
});
|
|
944
928
|
}
|
|
945
|
-
} else if (item.workOrderComponentType === 'WDT_EXCHANGE_GOODS') {
|
|
946
|
-
var wdtExchange = get(nowData, "".concat(item.uniqueKey), {});
|
|
947
|
-
contentVoList.push({
|
|
948
|
-
uniqueKey: "".concat(item.uniqueKey, "_wdtExchangeGoods"),
|
|
949
|
-
content: wdtExchange === null || wdtExchange === void 0 ? void 0 : wdtExchange.wdtExchangeGoods,
|
|
950
|
-
name: item.name
|
|
951
|
-
});
|
|
952
|
-
contentVoList.push({
|
|
953
|
-
uniqueKey: "".concat(item.uniqueKey, "_shopCode"),
|
|
954
|
-
content: (wdtExchange === null || wdtExchange === void 0 ? void 0 : wdtExchange.shopCode) || '',
|
|
955
|
-
name: item.name
|
|
956
|
-
});
|
|
957
929
|
} else if (['BS_REISSUE_GOODS', 'WDT_REISSUE_GOODS'].includes(item.workOrderComponentType)) {
|
|
958
930
|
var reissueMap = {
|
|
959
931
|
BS_REISSUE_GOODS: {
|
|
@@ -991,34 +963,21 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
|
|
|
991
963
|
name: item.name
|
|
992
964
|
});
|
|
993
965
|
}
|
|
994
|
-
} else if (
|
|
995
|
-
var
|
|
996
|
-
var compType = item.workOrderComponentType;
|
|
997
|
-
var returnGoodsMap = {
|
|
998
|
-
BS_RETURN_GOODS: {
|
|
999
|
-
returnTypeKey: 'bsReturnType',
|
|
1000
|
-
returnGoodsKey: 'bsReturnGoods',
|
|
1001
|
-
shopCodeKey: 'shopCode'
|
|
1002
|
-
},
|
|
1003
|
-
WDT_RETURN_GOODS: {
|
|
1004
|
-
returnTypeKey: 'wdtReturnType',
|
|
1005
|
-
returnGoodsKey: 'wdtReturnGoods',
|
|
1006
|
-
shopCodeKey: 'shopCode'
|
|
1007
|
-
}
|
|
1008
|
-
};
|
|
966
|
+
} else if (item.workOrderComponentType === 'BS_RETURN_GOODS') {
|
|
967
|
+
var bsReturn = get(nowData, "".concat(item.uniqueKey), {});
|
|
1009
968
|
contentVoList.push({
|
|
1010
|
-
uniqueKey: "".concat(item.uniqueKey, "
|
|
1011
|
-
content:
|
|
969
|
+
uniqueKey: "".concat(item.uniqueKey, "_bsReturnType"),
|
|
970
|
+
content: bsReturn === null || bsReturn === void 0 ? void 0 : bsReturn.bsReturnType,
|
|
1012
971
|
name: item.name
|
|
1013
972
|
});
|
|
1014
973
|
contentVoList.push({
|
|
1015
|
-
uniqueKey: "".concat(item.uniqueKey, "
|
|
1016
|
-
content:
|
|
974
|
+
uniqueKey: "".concat(item.uniqueKey, "_bsReturnGoods"),
|
|
975
|
+
content: bsReturn === null || bsReturn === void 0 ? void 0 : bsReturn.bsReturnGoods,
|
|
1017
976
|
name: item.name
|
|
1018
977
|
});
|
|
1019
978
|
contentVoList.push({
|
|
1020
|
-
uniqueKey: "".concat(item.uniqueKey, "
|
|
1021
|
-
content: (
|
|
979
|
+
uniqueKey: "".concat(item.uniqueKey, "_shopCode"),
|
|
980
|
+
content: (bsReturn === null || bsReturn === void 0 ? void 0 : bsReturn.shopCode) || '',
|
|
1022
981
|
name: item.name
|
|
1023
982
|
});
|
|
1024
983
|
} else if (item.workOrderComponentType === 'BS_POSTING') {
|
|
@@ -1416,9 +1375,10 @@ var transDataSource = function transDataSource(templateColumns) {
|
|
|
1416
1375
|
flag: item.jsonMap["".concat(nex.uniqueKey, "_bsFlag")]
|
|
1417
1376
|
}));
|
|
1418
1377
|
} else if (nex.workOrderComponentType === 'REISSUE_LOGISTICS') {
|
|
1419
|
-
var _itemList6 = jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_reissueLogisticsList")], [
|
|
1420
|
-
|
|
1421
|
-
|
|
1378
|
+
var _itemList6 = jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_reissueLogisticsList")], [{
|
|
1379
|
+
logisticsCompany: null,
|
|
1380
|
+
logisticsCode: null
|
|
1381
|
+
}]);
|
|
1422
1382
|
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), _itemList6));
|
|
1423
1383
|
} else if (['REISSUE_STATUS', 'ADJUST_WORK_ORDER_STATUS', 'CREATE_STATUS', 'INVOICE_STATUS', 'INVOICING_STATUS'].includes(nex.workOrderComponentType)) {
|
|
1424
1384
|
var STATUS_MAP = {
|
|
@@ -1454,7 +1414,11 @@ var transDataSource = function transDataSource(templateColumns) {
|
|
|
1454
1414
|
WAREHOUSING_STATUS: 'inStockStatusItemList',
|
|
1455
1415
|
MSG_STATUS: 'msgStatusValues'
|
|
1456
1416
|
};
|
|
1457
|
-
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_").concat(STATUS_LIST_MAP[nex.workOrderComponentType])], [])
|
|
1417
|
+
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_").concat(STATUS_LIST_MAP[nex.workOrderComponentType])], ['WAREHOUSING_STATUS', 'MSG_STATUS'].includes(nex.workOrderComponentType) ? [] : [{
|
|
1418
|
+
status: undefined,
|
|
1419
|
+
reason: '',
|
|
1420
|
+
systemOrderId: ''
|
|
1421
|
+
}])));
|
|
1458
1422
|
} else if (['BS_LOGISTICS', 'WLN_LOGISTICS', 'WDT_LOGISTICS'].includes(nex.workOrderComponentType)) {
|
|
1459
1423
|
var LogisticsMap = {
|
|
1460
1424
|
BS_LOGISTICS: {
|
|
@@ -1475,7 +1439,7 @@ var transDataSource = function transDataSource(templateColumns) {
|
|
|
1475
1439
|
logisticsCompany: null,
|
|
1476
1440
|
logisticsCode: null
|
|
1477
1441
|
}]));
|
|
1478
|
-
} else if (['BS_SEND_GOOD', 'WLN_SEND_GOOD', 'WDT_SEND_GOOD'
|
|
1442
|
+
} else if (['BS_SEND_GOOD', 'WLN_SEND_GOOD', 'WDT_SEND_GOOD'].includes(nex.workOrderComponentType)) {
|
|
1479
1443
|
var sendGoodMap = {
|
|
1480
1444
|
BS_SEND_GOOD: {
|
|
1481
1445
|
list: 'bsSendGood'
|
|
@@ -1485,9 +1449,6 @@ var transDataSource = function transDataSource(templateColumns) {
|
|
|
1485
1449
|
},
|
|
1486
1450
|
WDT_SEND_GOOD: {
|
|
1487
1451
|
list: 'wdtSendGood'
|
|
1488
|
-
},
|
|
1489
|
-
KM_SEND_GOOD: {
|
|
1490
|
-
list: 'kmSendGood'
|
|
1491
1452
|
}
|
|
1492
1453
|
};
|
|
1493
1454
|
var _itemList8 = jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_").concat(sendGoodMap[nex.workOrderComponentType].list)], [{
|
|
@@ -1573,27 +1534,12 @@ var transDataSource = function transDataSource(templateColumns) {
|
|
|
1573
1534
|
bsExchangeGiftGoods: jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_bsExchangeGiftGoods")], []),
|
|
1574
1535
|
shopCode: item.jsonMap["".concat(nex.uniqueKey, "_shopCode")]
|
|
1575
1536
|
}));
|
|
1576
|
-
} else if (nex.workOrderComponentType === '
|
|
1537
|
+
} else if (nex.workOrderComponentType === 'BS_RETURN_GOODS') {
|
|
1577
1538
|
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), {
|
|
1578
|
-
|
|
1539
|
+
bsReturnType: jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_bsReturnType")], []),
|
|
1540
|
+
bsReturnGoods: jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_bsReturnGoods")], []),
|
|
1579
1541
|
shopCode: item.jsonMap["".concat(nex.uniqueKey, "_shopCode")]
|
|
1580
1542
|
}));
|
|
1581
|
-
} else if (['BS_RETURN_GOODS', 'WDT_RETURN_GOODS'].includes(nex.workOrderComponentType)) {
|
|
1582
|
-
var _$concat2;
|
|
1583
|
-
var compType = nex.workOrderComponentType;
|
|
1584
|
-
var returnGoodsMap = {
|
|
1585
|
-
BS_RETURN_GOODS: {
|
|
1586
|
-
returnTypeKey: 'bsReturnType',
|
|
1587
|
-
returnGoodsKey: 'bsReturnGoods',
|
|
1588
|
-
shopCodeKey: 'shopCode'
|
|
1589
|
-
},
|
|
1590
|
-
WDT_RETURN_GOODS: {
|
|
1591
|
-
returnTypeKey: 'wdtReturnType',
|
|
1592
|
-
returnGoodsKey: 'wdtReturnGoods',
|
|
1593
|
-
shopCodeKey: 'shopCode'
|
|
1594
|
-
}
|
|
1595
|
-
};
|
|
1596
|
-
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), (_$concat2 = {}, _defineProperty(_$concat2, returnGoodsMap[compType].returnTypeKey, jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_").concat(returnGoodsMap[compType].returnTypeKey)], [])), _defineProperty(_$concat2, returnGoodsMap[compType].returnGoodsKey, jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_").concat(returnGoodsMap[compType].returnGoodsKey)], [])), _defineProperty(_$concat2, returnGoodsMap[compType].shopCodeKey, item.jsonMap["".concat(nex.uniqueKey, "_").concat(returnGoodsMap[compType].shopCodeKey)]), _$concat2)));
|
|
1597
1543
|
} else if (['BS_SYSTEM_ORDER', 'WLN_SYSTEM_ORDER', 'WDT_SYSTEM_ORDER'].includes(nex.workOrderComponentType)) {
|
|
1598
1544
|
var systemOrderMap = {
|
|
1599
1545
|
BS_SYSTEM_ORDER: {
|
|
@@ -1631,17 +1577,24 @@ var transDataSource = function transDataSource(templateColumns) {
|
|
|
1631
1577
|
},
|
|
1632
1578
|
RETURN_GOODS_TRADE_ID: {
|
|
1633
1579
|
key: 'returnGoodsTradeItemList',
|
|
1634
|
-
defaultValue: [
|
|
1635
|
-
|
|
1580
|
+
defaultValue: [{
|
|
1581
|
+
returnGoodsTradeId: '',
|
|
1582
|
+
systemOrderId: ''
|
|
1583
|
+
}]
|
|
1636
1584
|
},
|
|
1637
|
-
|
|
1638
1585
|
REISSUE_TRADE_ID: {
|
|
1639
1586
|
key: 'tradeItemList',
|
|
1640
|
-
defaultValue: [
|
|
1587
|
+
defaultValue: [{
|
|
1588
|
+
billNo: '',
|
|
1589
|
+
tradeId: ''
|
|
1590
|
+
}]
|
|
1641
1591
|
},
|
|
1642
1592
|
EXCHANGE_TRADE_ID: {
|
|
1643
1593
|
key: 'tradeItemList',
|
|
1644
|
-
defaultValue: [
|
|
1594
|
+
defaultValue: [{
|
|
1595
|
+
billNo: '',
|
|
1596
|
+
tradeId: ''
|
|
1597
|
+
}]
|
|
1645
1598
|
}
|
|
1646
1599
|
};
|
|
1647
1600
|
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_").concat(SYSTEM_ORDER_MAP[nex.workOrderComponentType].key)], SYSTEM_ORDER_MAP[nex.workOrderComponentType].defaultValue)));
|
|
@@ -1658,10 +1611,8 @@ var transDataSource = function transDataSource(templateColumns) {
|
|
|
1658
1611
|
wdtSystemOrderNo: item.jsonMap["".concat(nex.uniqueKey, "_wdtSystemOrderNo")]
|
|
1659
1612
|
}));
|
|
1660
1613
|
} else if (nex.workOrderComponentType === 'LABEL') {
|
|
1661
|
-
var
|
|
1662
|
-
return _objectSpread(_objectSpread({}, cur), {}, (
|
|
1663
|
-
} else if (nex.workOrderComponentType === 'AFTER_SALES_ORDER_ID') {
|
|
1664
|
-
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_afterSalesOrderId")]));
|
|
1614
|
+
var _objectSpread54;
|
|
1615
|
+
return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread54 = {}, _defineProperty(_objectSpread54, "".concat(nex.uniqueKey), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_label")], [])), _defineProperty(_objectSpread54, "".concat(nex.uniqueKey, "_label"), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_label")], [])), _objectSpread54));
|
|
1665
1616
|
}
|
|
1666
1617
|
}, {});
|
|
1667
1618
|
};
|
|
@@ -1683,7 +1634,7 @@ export var calcWorkOrderList = function calcWorkOrderList(source, templateColumn
|
|
|
1683
1634
|
//订单返填
|
|
1684
1635
|
export var orderBack = /*#__PURE__*/function () {
|
|
1685
1636
|
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,
|
|
1637
|
+
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, _objectSpread56, _cacheOrderInfo;
|
|
1687
1638
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
1688
1639
|
while (1) switch (_context.prev = _context.next) {
|
|
1689
1640
|
case 0:
|
|
@@ -1788,7 +1739,6 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
1788
1739
|
bsOrders = (bsOrder === null || bsOrder === void 0 ? void 0 : (_bsOrder$value = bsOrder.value) === null || _bsOrder$value === void 0 ? void 0 : _bsOrder$value.data) || {};
|
|
1789
1740
|
wlnOrders = (wlnOrder === null || wlnOrder === void 0 ? void 0 : (_wlnOrder$value = wlnOrder.value) === null || _wlnOrder$value === void 0 ? void 0 : _wlnOrder$value.data) || {};
|
|
1790
1741
|
wdtOrders = (wdtOrder === null || wdtOrder === void 0 ? void 0 : (_wdtOrder$value = wdtOrder.value) === null || _wdtOrder$value === void 0 ? void 0 : _wdtOrder$value.data) || {};
|
|
1791
|
-
wdtOrders.trades = filterWdtOrders(wdtOrders, order_no);
|
|
1792
1742
|
Monitor.automaticReport({
|
|
1793
1743
|
message: "orderBack:\u8BA2\u5355\u53F7:".concat(order_no, ",\u5E97\u94FAid:").concat(shopId, ", \u8BA2\u5355\u4FE1\u606F\uFF1A").concat(JSON.stringify(orderInfo), ",jst\u4FE1\u606F:").concat(JSON.stringify(jstInfo), ",bs\u4FE1\u606F:").concat(JSON.stringify(bsOrders), ",wln\u4FE1\u606F:").concat(JSON.stringify(wlnOrders), ",wdt\u4FE1\u606F:").concat(JSON.stringify(wdtOrders))
|
|
1794
1744
|
});
|
|
@@ -1798,10 +1748,8 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
1798
1748
|
});
|
|
1799
1749
|
}
|
|
1800
1750
|
bsInfo = bsOrderTransform(bsOrders || {});
|
|
1801
|
-
wlnInfo = wlnOrderTransform(wlnOrders || {});
|
|
1802
|
-
wdtInfo = wdtOrderTransform(
|
|
1803
|
-
componentList: templateDetail.componentDtoList
|
|
1804
|
-
}), form, order_no);
|
|
1751
|
+
wlnInfo = wlnOrderTransform(wlnOrders || {});
|
|
1752
|
+
wdtInfo = wdtOrderTransform(wdtOrders || {});
|
|
1805
1753
|
if ((bsOrders === null || bsOrders === void 0 ? void 0 : (_bsOrders$orders = bsOrders.orders) === null || _bsOrders$orders === void 0 ? void 0 : _bsOrders$orders.length) > 1) {
|
|
1806
1754
|
bsInfo.bsGoods = _objectSpread(_objectSpread({}, bsInfo.bsGoods), {}, {
|
|
1807
1755
|
bsGoods: []
|
|
@@ -1863,7 +1811,7 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
1863
1811
|
hasSelectItem = HasErpItemSelectHandle(templateDetail);
|
|
1864
1812
|
erpPromiseList = [];
|
|
1865
1813
|
if (!(shopSourceStr === 'TAOBAO' && hasSelectItem)) {
|
|
1866
|
-
_context.next =
|
|
1814
|
+
_context.next = 56;
|
|
1867
1815
|
break;
|
|
1868
1816
|
}
|
|
1869
1817
|
list = detail['itemList'];
|
|
@@ -1881,10 +1829,10 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
1881
1829
|
resolve({});
|
|
1882
1830
|
});
|
|
1883
1831
|
});
|
|
1884
|
-
_context.prev =
|
|
1885
|
-
_context.next =
|
|
1832
|
+
_context.prev = 46;
|
|
1833
|
+
_context.next = 49;
|
|
1886
1834
|
return Promise.all(promises);
|
|
1887
|
-
case
|
|
1835
|
+
case 49:
|
|
1888
1836
|
erpPromiseList = _context.sent;
|
|
1889
1837
|
detail['itemList'] = (_detail$itemList = detail['itemList']) === null || _detail$itemList === void 0 ? void 0 : _detail$itemList.map(function (item, index) {
|
|
1890
1838
|
return _objectSpread(_objectSpread({}, item), {}, {
|
|
@@ -1894,13 +1842,13 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
1894
1842
|
})
|
|
1895
1843
|
});
|
|
1896
1844
|
});
|
|
1897
|
-
_context.next =
|
|
1845
|
+
_context.next = 56;
|
|
1898
1846
|
break;
|
|
1899
|
-
case
|
|
1900
|
-
_context.prev =
|
|
1901
|
-
_context.t0 = _context["catch"](
|
|
1847
|
+
case 53:
|
|
1848
|
+
_context.prev = 53;
|
|
1849
|
+
_context.t0 = _context["catch"](46);
|
|
1902
1850
|
console.error('调用erp获取宝贝编码错误', _context.t0);
|
|
1903
|
-
case
|
|
1851
|
+
case 56:
|
|
1904
1852
|
// console.log('detail', detail);
|
|
1905
1853
|
values = orderBackFormValues({
|
|
1906
1854
|
detail: detail,
|
|
@@ -1925,23 +1873,23 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
1925
1873
|
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
1874
|
} else {
|
|
1927
1875
|
_cacheOrderInfo = JSON.parse(sessionStorage.getItem('cacheOrderInfo') || '{}');
|
|
1928
|
-
sessionStorage.setItem('cacheOrderInfo', JSON.stringify(_objectSpread(_objectSpread({}, _cacheOrderInfo), {}, (
|
|
1876
|
+
sessionStorage.setItem('cacheOrderInfo', JSON.stringify(_objectSpread(_objectSpread({}, _cacheOrderInfo), {}, (_objectSpread56 = {}, _defineProperty(_objectSpread56, order_no, values), _defineProperty(_objectSpread56, "".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId), _defineProperty({}, order_no, _objectSpread(_objectSpread({}, formValue), values))), _objectSpread56))));
|
|
1929
1877
|
}
|
|
1930
1878
|
}
|
|
1931
1879
|
// console.log('orderback', values);
|
|
1932
1880
|
form.setFieldsValue(_objectSpread(_objectSpread({}, formValue), values));
|
|
1933
1881
|
callback === null || callback === void 0 ? void 0 : callback(detail, templateDetail);
|
|
1934
|
-
_context.next =
|
|
1882
|
+
_context.next = 65;
|
|
1935
1883
|
break;
|
|
1936
|
-
case
|
|
1937
|
-
_context.prev =
|
|
1884
|
+
case 62:
|
|
1885
|
+
_context.prev = 62;
|
|
1938
1886
|
_context.t1 = _context["catch"](8);
|
|
1939
1887
|
console.error(_context.t1);
|
|
1940
|
-
case
|
|
1888
|
+
case 65:
|
|
1941
1889
|
case "end":
|
|
1942
1890
|
return _context.stop();
|
|
1943
1891
|
}
|
|
1944
|
-
}, _callee, null, [[8,
|
|
1892
|
+
}, _callee, null, [[8, 62], [46, 53]]);
|
|
1945
1893
|
}));
|
|
1946
1894
|
return function orderBack(_x) {
|
|
1947
1895
|
return _ref2.apply(this, arguments);
|
|
@@ -2246,8 +2194,6 @@ export var reversalFormValues = function reversalFormValues() {
|
|
|
2246
2194
|
case 'BS_EXCHANGE_GOODS':
|
|
2247
2195
|
case 'BS_RETURN_GOODS':
|
|
2248
2196
|
case 'WDT_REISSUE_GOODS':
|
|
2249
|
-
case 'WDT_RETURN_GOODS':
|
|
2250
|
-
case 'WDT_EXCHANGE_GOODS':
|
|
2251
2197
|
prv["".concat(next.uniqueKey, "_shopCode")] = values[next.uniqueKey]['shopCode'];
|
|
2252
2198
|
break;
|
|
2253
2199
|
case 'BS_DELIVERY_NO':
|
|
@@ -89,21 +89,22 @@ export var fetchLogicFlowList = /*#__PURE__*/function () {
|
|
|
89
89
|
});
|
|
90
90
|
}
|
|
91
91
|
return prv;
|
|
92
|
-
}, []);
|
|
92
|
+
}, []);
|
|
93
|
+
console.log(list);
|
|
93
94
|
dispatch(setLogicFlowList(list || []));
|
|
94
95
|
dispatch(setGroupLogicFlowList(groupLogicFlowList || []));
|
|
95
96
|
dispatch(setFlowTemplateGroupWorkOrderTemplateList(flowTemplateGroupWOrkOrderTemplateList) || []);
|
|
96
|
-
_context.next =
|
|
97
|
+
_context.next = 18;
|
|
97
98
|
break;
|
|
98
|
-
case
|
|
99
|
-
_context.prev =
|
|
99
|
+
case 15:
|
|
100
|
+
_context.prev = 15;
|
|
100
101
|
_context.t0 = _context["catch"](0);
|
|
101
102
|
console.error(_context.t0);
|
|
102
|
-
case
|
|
103
|
+
case 18:
|
|
103
104
|
case "end":
|
|
104
105
|
return _context.stop();
|
|
105
106
|
}
|
|
106
|
-
}, _callee, null, [[0,
|
|
107
|
+
}, _callee, null, [[0, 15]]);
|
|
107
108
|
}));
|
|
108
109
|
return function fetchLogicFlowList(_x) {
|
|
109
110
|
return _ref.apply(this, arguments);
|
package/package.json
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kmkf-fe-packages/kmkf-work-order-service-component",
|
|
3
|
-
"version": "1.4.
|
|
3
|
+
"version": "1.4.2",
|
|
4
4
|
"module": "dist/esm/index.js",
|
|
5
5
|
"typings": "dist/esm/index.d.ts",
|
|
6
6
|
"files": [
|
|
7
7
|
"dist"
|
|
8
8
|
],
|
|
9
9
|
"scripts": {
|
|
10
|
-
"
|
|
10
|
+
"async": "yarn build && yalc push",
|
|
11
11
|
"build": "yarn run lint && father build",
|
|
12
12
|
"deploy": "npm run docs:build && npm run docs:deploy",
|
|
13
13
|
"docs:build": "dumi build",
|
|
@@ -32,9 +32,9 @@
|
|
|
32
32
|
},
|
|
33
33
|
"dependencies": {
|
|
34
34
|
"@ant-design/icons": "^4.7.0",
|
|
35
|
-
"@kmkf-fe-packages/basic-components": "1.4.
|
|
36
|
-
"@kmkf-fe-packages/kmkf-utils": "1.4.
|
|
37
|
-
"@kmkf-fe-packages/services-components": "1.4.
|
|
35
|
+
"@kmkf-fe-packages/basic-components": "1.4.2",
|
|
36
|
+
"@kmkf-fe-packages/kmkf-utils": "1.4.2",
|
|
37
|
+
"@kmkf-fe-packages/services-components": "1.4.2",
|
|
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": "
|
|
76
|
+
"gitHead": "0a85a17cc8fd63cb7f30daf63beebd034f58da6e",
|
|
77
77
|
"gitHooks": {
|
|
78
78
|
"pre-commit": "lint-staged"
|
|
79
79
|
}
|