@kmkf-fe-packages/kmkf-work-order-service-component 2.7.3-beta.0 → 2.7.3-beta.10
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/dist/esm/FlowTemplateDetailV2/components/FormRender/index.js +23 -45
- package/dist/esm/FlowTemplateDetailV2/components/FormRender/onBlur.d.ts +1 -1
- package/dist/esm/FlowTemplateDetailV2/components/FormRender/onBlur.js +34 -20
- package/dist/esm/FlowTemplateDetailV2/components/XiaozhiConversation/index.d.ts +3 -1
- package/dist/esm/FlowTemplateDetailV2/components/XiaozhiConversation/index.js +18 -8
- package/dist/esm/FlowTemplateDetailV2/index.js +10 -8
- package/dist/esm/common/utils/tools.d.ts +1 -1
- package/dist/esm/common/utils/tools.js +18 -12
- package/dist/esm/common/utils/tools_constants.js +20 -5
- package/dist/esm/common/utils/transformWorkOrderData.js +27 -5
- package/package.json +5 -5
|
@@ -442,7 +442,7 @@ var FormRender = function FormRender(props, ref) {
|
|
|
442
442
|
return prv;
|
|
443
443
|
}, {});
|
|
444
444
|
if (!workOrderId) {
|
|
445
|
-
_context2.next =
|
|
445
|
+
_context2.next = 70;
|
|
446
446
|
break;
|
|
447
447
|
}
|
|
448
448
|
// 先初始化端上内容
|
|
@@ -475,7 +475,7 @@ var FormRender = function FormRender(props, ref) {
|
|
|
475
475
|
// TODO: 非开始节点录入,都会有workOrderId,这里判断是否有前置组件含有订单号;如果存在订单号,进行订单反填。
|
|
476
476
|
tradeIdUniqueKey = findComponentUniqueKeyByType(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList, 'TRADE_ID_INPUT');
|
|
477
477
|
if (!notAutoFillFlag) {
|
|
478
|
-
_context2.next =
|
|
478
|
+
_context2.next = 66;
|
|
479
479
|
break;
|
|
480
480
|
}
|
|
481
481
|
currentNodeTradeIdUniqueKey = findComponentUniqueKeyByType(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, 'TRADE_ID_INPUT');
|
|
@@ -526,11 +526,11 @@ var FormRender = function FormRender(props, ref) {
|
|
|
526
526
|
plat: plat,
|
|
527
527
|
callKey: 1,
|
|
528
528
|
setLoading: setLoading,
|
|
529
|
-
|
|
529
|
+
matchLogisticsNo: lastLogisticsOrderBackSource === null || lastLogisticsOrderBackSource === void 0 ? void 0 : lastLogisticsOrderBackSource.logisticsCode,
|
|
530
530
|
skipOrderBackUniqueKeys: lastLogisticsOrderBackSource !== null && lastLogisticsOrderBackSource !== void 0 && lastLogisticsOrderBackSource.uniqueKey ? [lastLogisticsOrderBackSource.uniqueKey] : []
|
|
531
531
|
});
|
|
532
532
|
case 33:
|
|
533
|
-
_context2.next =
|
|
533
|
+
_context2.next = 63;
|
|
534
534
|
break;
|
|
535
535
|
case 35:
|
|
536
536
|
if (!isSkx) {
|
|
@@ -548,7 +548,7 @@ var FormRender = function FormRender(props, ref) {
|
|
|
548
548
|
case 38:
|
|
549
549
|
// 售后单反填
|
|
550
550
|
afterSaleOrderBack(form, templateDetail);
|
|
551
|
-
_context2.next =
|
|
551
|
+
_context2.next = 63;
|
|
552
552
|
break;
|
|
553
553
|
case 41:
|
|
554
554
|
if (!logisticsOrderBackSources.length) {
|
|
@@ -589,47 +589,25 @@ var FormRender = function FormRender(props, ref) {
|
|
|
589
589
|
_iterator.f();
|
|
590
590
|
return _context2.finish(57);
|
|
591
591
|
case 60:
|
|
592
|
-
_context2.next =
|
|
592
|
+
_context2.next = 63;
|
|
593
593
|
break;
|
|
594
594
|
case 62:
|
|
595
595
|
// 售后单反填
|
|
596
596
|
afterSaleOrderBack(form, templateDetail);
|
|
597
|
-
|
|
598
|
-
_context2.next = 68;
|
|
599
|
-
break;
|
|
600
|
-
}
|
|
601
|
-
_context2.next = 66;
|
|
602
|
-
return skxOrderBack({
|
|
603
|
-
form: form,
|
|
604
|
-
companyKey: companyKey,
|
|
605
|
-
templateDetail: templateDetail,
|
|
606
|
-
componentOnBlur: componentOnBlur,
|
|
607
|
-
jsonMap: record === null || record === void 0 ? void 0 : record.jsonMap
|
|
608
|
-
});
|
|
609
|
-
case 66:
|
|
610
|
-
_context2.next = 71;
|
|
611
|
-
break;
|
|
612
|
-
case 68:
|
|
613
|
-
if (!(hasWdt && currentNodeLogisticsCode)) {
|
|
614
|
-
_context2.next = 71;
|
|
615
|
-
break;
|
|
616
|
-
}
|
|
617
|
-
_context2.next = 71;
|
|
618
|
-
return componentOnBlur(currentNodeLogisticsCode, 'expressLogisticsCode');
|
|
619
|
-
case 71:
|
|
597
|
+
case 63:
|
|
620
598
|
// 仅在依赖值有值且映射值为空时触发一次映射
|
|
621
599
|
batchFillByMappingWhenTargetEmpty(initialValues);
|
|
622
|
-
_context2.next =
|
|
600
|
+
_context2.next = 68;
|
|
623
601
|
break;
|
|
624
|
-
case
|
|
602
|
+
case 66:
|
|
625
603
|
// 如果没有订单反填,则单独更新remark
|
|
626
604
|
fetchRemark(shopId, currentNodeTid);
|
|
627
605
|
// 售后单反填
|
|
628
606
|
afterSaleOrderBack(form, templateDetail);
|
|
629
|
-
case
|
|
630
|
-
_context2.next =
|
|
607
|
+
case 68:
|
|
608
|
+
_context2.next = 94;
|
|
631
609
|
break;
|
|
632
|
-
case
|
|
610
|
+
case 70:
|
|
633
611
|
fillByShopId(shopId);
|
|
634
612
|
initFormValues = null;
|
|
635
613
|
if (plat !== null && plat !== void 0 && plat.subOrderNo) {
|
|
@@ -648,7 +626,7 @@ var FormRender = function FormRender(props, ref) {
|
|
|
648
626
|
|
|
649
627
|
// console.log(orderNo, initFormValues);
|
|
650
628
|
if (!initFormValues) {
|
|
651
|
-
_context2.next =
|
|
629
|
+
_context2.next = 81;
|
|
652
630
|
break;
|
|
653
631
|
}
|
|
654
632
|
form.setFieldsValue(_objectSpread(_objectSpread({}, initFormValues), {}, {
|
|
@@ -665,9 +643,9 @@ var FormRender = function FormRender(props, ref) {
|
|
|
665
643
|
_orderNo = orderNoField !== null && orderNoField !== void 0 && orderNoField.uniqueKey ? initFormValues[orderNoField === null || orderNoField === void 0 ? void 0 : orderNoField.uniqueKey] || _orderNo : _orderNo;
|
|
666
644
|
}
|
|
667
645
|
fetchRemark(_shopId, _orderNo);
|
|
668
|
-
_context2.next =
|
|
646
|
+
_context2.next = 94;
|
|
669
647
|
break;
|
|
670
|
-
case
|
|
648
|
+
case 81:
|
|
671
649
|
_transData = calcWorkOrderList([{
|
|
672
650
|
jsonMap: jsonMap
|
|
673
651
|
}], [].concat(_toConsumableArray((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList) || []), _toConsumableArray((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || [])), 'init');
|
|
@@ -679,12 +657,12 @@ var FormRender = function FormRender(props, ref) {
|
|
|
679
657
|
batchFillByMapping(_initialValues);
|
|
680
658
|
//如果有订单号 订单返填 通过订单号入口进行工单录入,需要将订单数据反填到工单
|
|
681
659
|
if (!(orderNo && shopId)) {
|
|
682
|
-
_context2.next =
|
|
660
|
+
_context2.next = 92;
|
|
683
661
|
break;
|
|
684
662
|
}
|
|
685
663
|
queryLabels(orderNo, shopId);
|
|
686
664
|
queryMemberLevels(orderNo, shopId);
|
|
687
|
-
_context2.next =
|
|
665
|
+
_context2.next = 90;
|
|
688
666
|
return orderBack({
|
|
689
667
|
companyKey: companyKey,
|
|
690
668
|
order_no: orderNo,
|
|
@@ -699,15 +677,15 @@ var FormRender = function FormRender(props, ref) {
|
|
|
699
677
|
callKey: 2,
|
|
700
678
|
setLoading: setLoading
|
|
701
679
|
});
|
|
702
|
-
case
|
|
703
|
-
_context2.next =
|
|
680
|
+
case 90:
|
|
681
|
+
_context2.next = 94;
|
|
704
682
|
break;
|
|
705
|
-
case
|
|
683
|
+
case 92:
|
|
706
684
|
// 如果没有订单反填,则单独更新remark
|
|
707
685
|
fetchRemark(shopId, currentNodeTid);
|
|
708
686
|
// 售后单反填
|
|
709
687
|
afterSaleOrderBack(form, templateDetail);
|
|
710
|
-
case
|
|
688
|
+
case 94:
|
|
711
689
|
antFormEl = document.getElementsByClassName('ant-form');
|
|
712
690
|
(antFormEl === null || antFormEl === void 0 ? void 0 : antFormEl.length) > 0 && set(antFormEl, '0.scrollTop', 0);
|
|
713
691
|
resetMappingHideComponents();
|
|
@@ -716,7 +694,7 @@ var FormRender = function FormRender(props, ref) {
|
|
|
716
694
|
type: 'setaAutoSubmitFlag',
|
|
717
695
|
payload: true
|
|
718
696
|
});
|
|
719
|
-
case
|
|
697
|
+
case 98:
|
|
720
698
|
case "end":
|
|
721
699
|
return _context2.stop();
|
|
722
700
|
}
|
|
@@ -1002,7 +980,7 @@ var FormRender = function FormRender(props, ref) {
|
|
|
1002
980
|
},
|
|
1003
981
|
callKey: 3,
|
|
1004
982
|
setLoading: setLoading,
|
|
1005
|
-
|
|
983
|
+
matchLogisticsNo: options === null || options === void 0 ? void 0 : options.matchLogisticsNo,
|
|
1006
984
|
skipOrderBackUniqueKeys: options === null || options === void 0 ? void 0 : options.skipOrderBackUniqueKeys
|
|
1007
985
|
});
|
|
1008
986
|
case 5:
|
|
@@ -11,7 +11,7 @@ export declare const onBlurExpressLogisticsCode: ({ form, value, templateDetail,
|
|
|
11
11
|
templateDetail: any;
|
|
12
12
|
setKmLoading: (loading: boolean) => void;
|
|
13
13
|
componentOnBlur: (value: any, type: string, uniqueKey?: string, options?: {
|
|
14
|
-
|
|
14
|
+
matchLogisticsNo?: string;
|
|
15
15
|
skipOrderBackUniqueKeys?: string[];
|
|
16
16
|
}) => Promise<void>;
|
|
17
17
|
sourceUniqueKey?: string | undefined;
|
|
@@ -47,7 +47,7 @@ export var onBlurErpAfterSaleTradeId = /*#__PURE__*/function () {
|
|
|
47
47
|
export var onBlurExpressLogisticsCode = /*#__PURE__*/function () {
|
|
48
48
|
var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref3) {
|
|
49
49
|
var _kmErpVideoComponent$2;
|
|
50
|
-
var form, value, templateDetail, setKmLoading, componentOnBlur, sourceUniqueKey, _ref3$onlyGetTid, onlyGetTid, _ref3$needTradeIdOrde, needTradeIdOrderBack, hasTradeIdComponent, kmErpVideoComponent, _res$data, _tradeIdComponent$com, hasKm, hasWdt, userInfo, _userInfo$companyUser, _companyUserConfig$pl, _companyUserConfig, _companyUserConfig$pl2, _companyUserConfig$pl3, _companyUserConfig$pl4, _companyUserConfig2, _companyUserConfig2$p, _companyUserConfig2$p2, companyUserConfig, res, tradeId, tradeIdComponent, newTradeId, blurPromise;
|
|
50
|
+
var form, value, templateDetail, setKmLoading, componentOnBlur, sourceUniqueKey, _ref3$onlyGetTid, onlyGetTid, _ref3$needTradeIdOrde, needTradeIdOrderBack, hasTradeIdComponent, kmErpVideoComponent, _res$data, _tradeIdComponent$com, hasKm, hasWdt, userInfo, _userInfo$companyUser, _companyUserConfig$pl, _companyUserConfig, _companyUserConfig$pl2, _companyUserConfig$pl3, _companyUserConfig$pl4, _companyUserConfig2, _companyUserConfig2$p, _companyUserConfig2$p2, companyUserConfig, wdtOrderBackTypes, kmOrderBackTypes, hasWdtOrderBackComponent, hasKmOrderBackComponent, shouldUseWdtOutSidQuery, res, tradeId, tradeIdComponent, newTradeId, blurPromise;
|
|
51
51
|
return _regeneratorRuntime().wrap(function _callee2$(_context2) {
|
|
52
52
|
while (1) switch (_context2.prev = _context2.next) {
|
|
53
53
|
case 0:
|
|
@@ -72,7 +72,7 @@ export var onBlurExpressLogisticsCode = /*#__PURE__*/function () {
|
|
|
72
72
|
});
|
|
73
73
|
case 6:
|
|
74
74
|
if (!hasTradeIdComponent) {
|
|
75
|
-
_context2.next =
|
|
75
|
+
_context2.next = 41;
|
|
76
76
|
break;
|
|
77
77
|
}
|
|
78
78
|
hasKm = false;
|
|
@@ -106,59 +106,73 @@ export var onBlurExpressLogisticsCode = /*#__PURE__*/function () {
|
|
|
106
106
|
}
|
|
107
107
|
return _context2.abrupt("return");
|
|
108
108
|
case 12:
|
|
109
|
-
|
|
110
|
-
|
|
109
|
+
wdtOrderBackTypes = ['WDT_SYSTEM_ORDER', 'WDT_GOODS', 'WDT_REISSUE_GOODS', 'WDT_LOGISTICS', 'WDT_SEND_GOOD'];
|
|
110
|
+
kmOrderBackTypes = ['KM_SYSTEM_ORDER', 'KM_GOODS', 'KM_REISSUE_GOODS', 'KM_RETURN_GOODS', 'KM_EXCHANGE_GOODS', 'KM_LOGISTICS', 'KM_SEND_GOOD'];
|
|
111
|
+
hasWdtOrderBackComponent = templateDetail.componentDtoList.some(function (item) {
|
|
112
|
+
return wdtOrderBackTypes.includes(item.workOrderComponentType);
|
|
113
|
+
});
|
|
114
|
+
hasKmOrderBackComponent = templateDetail.componentDtoList.some(function (item) {
|
|
115
|
+
return kmOrderBackTypes.includes(item.workOrderComponentType);
|
|
116
|
+
});
|
|
117
|
+
shouldUseWdtOutSidQuery = hasWdt;
|
|
118
|
+
if (hasWdtOrderBackComponent && !hasKmOrderBackComponent) {
|
|
119
|
+
shouldUseWdtOutSidQuery = true;
|
|
120
|
+
} else if (hasKmOrderBackComponent && !hasWdtOrderBackComponent) {
|
|
121
|
+
shouldUseWdtOutSidQuery = false;
|
|
122
|
+
}
|
|
123
|
+
if (!shouldUseWdtOutSidQuery) {
|
|
124
|
+
_context2.next = 24;
|
|
111
125
|
break;
|
|
112
126
|
}
|
|
113
|
-
_context2.next =
|
|
127
|
+
_context2.next = 21;
|
|
114
128
|
return queryTidByWdtOutSid({
|
|
115
129
|
outSid: value
|
|
116
130
|
});
|
|
117
|
-
case
|
|
131
|
+
case 21:
|
|
118
132
|
_context2.t0 = _context2.sent;
|
|
119
|
-
_context2.next =
|
|
133
|
+
_context2.next = 27;
|
|
120
134
|
break;
|
|
121
|
-
case
|
|
122
|
-
_context2.next =
|
|
135
|
+
case 24:
|
|
136
|
+
_context2.next = 26;
|
|
123
137
|
return queryTidByOutSid({
|
|
124
138
|
outSid: value
|
|
125
139
|
});
|
|
126
|
-
case
|
|
140
|
+
case 26:
|
|
127
141
|
_context2.t0 = _context2.sent;
|
|
128
|
-
case
|
|
142
|
+
case 27:
|
|
129
143
|
res = _context2.t0;
|
|
130
144
|
tradeId = res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.tid;
|
|
131
145
|
if (!onlyGetTid) {
|
|
132
|
-
_context2.next =
|
|
146
|
+
_context2.next = 31;
|
|
133
147
|
break;
|
|
134
148
|
}
|
|
135
149
|
return _context2.abrupt("return", tradeId);
|
|
136
|
-
case
|
|
150
|
+
case 31:
|
|
137
151
|
if (tradeId) {
|
|
138
|
-
_context2.next =
|
|
152
|
+
_context2.next = 33;
|
|
139
153
|
break;
|
|
140
154
|
}
|
|
141
155
|
return _context2.abrupt("return");
|
|
142
|
-
case
|
|
156
|
+
case 33:
|
|
143
157
|
tradeIdComponent = templateDetail.componentDtoList.find(function (item) {
|
|
144
158
|
return item.workOrderComponentType === 'TRADE_ID_INPUT';
|
|
145
159
|
});
|
|
146
160
|
newTradeId = tradeIdComponent !== null && tradeIdComponent !== void 0 && (_tradeIdComponent$com = tradeIdComponent.componentConfig) !== null && _tradeIdComponent$com !== void 0 && _tradeIdComponent$com.toUpperCase ? tradeId.toUpperCase() : tradeId;
|
|
147
161
|
form.setFieldsValue(_defineProperty({}, (tradeIdComponent === null || tradeIdComponent === void 0 ? void 0 : tradeIdComponent.uniqueKey) || 'm3ap1EvEyd', newTradeId));
|
|
148
162
|
if (!needTradeIdOrderBack) {
|
|
149
|
-
_context2.next =
|
|
163
|
+
_context2.next = 40;
|
|
150
164
|
break;
|
|
151
165
|
}
|
|
152
166
|
// 创建一个异步操作的Promise
|
|
153
167
|
blurPromise = componentOnBlur(tradeId, 'tradeId', undefined, {
|
|
154
|
-
|
|
168
|
+
matchLogisticsNo: value,
|
|
155
169
|
skipOrderBackUniqueKeys: sourceUniqueKey ? [sourceUniqueKey] : []
|
|
156
170
|
}); // 等待异步操作完成后再执行setTimeout
|
|
157
|
-
_context2.next =
|
|
171
|
+
_context2.next = 40;
|
|
158
172
|
return blurPromise;
|
|
159
|
-
case
|
|
173
|
+
case 40:
|
|
160
174
|
return _context2.abrupt("return", res.data);
|
|
161
|
-
case
|
|
175
|
+
case 41:
|
|
162
176
|
case "end":
|
|
163
177
|
return _context2.stop();
|
|
164
178
|
}
|
|
@@ -3,15 +3,17 @@ export interface JumpCustomerIconProps {
|
|
|
3
3
|
tid: string;
|
|
4
4
|
shopName: string;
|
|
5
5
|
platformType: number;
|
|
6
|
+
buyer?: string;
|
|
6
7
|
onJumpPage?: (data: {
|
|
7
8
|
type: string;
|
|
8
9
|
params: string;
|
|
9
10
|
}) => void;
|
|
10
11
|
}
|
|
11
|
-
export declare const openCustomerDialog: ({ shopName, platformType, orderNumber, onJumpPage, }: {
|
|
12
|
+
export declare const openCustomerDialog: ({ shopName, platformType, orderNumber, buyer, onJumpPage, }: {
|
|
12
13
|
shopName: string;
|
|
13
14
|
platformType: number;
|
|
14
15
|
orderNumber?: string | undefined;
|
|
16
|
+
buyer?: string | undefined;
|
|
15
17
|
onJumpPage?: ((data: {
|
|
16
18
|
type: string;
|
|
17
19
|
params: string;
|
|
@@ -2,7 +2,7 @@ import React from 'react';
|
|
|
2
2
|
import { Tooltip, Image } from 'antd';
|
|
3
3
|
import { Base64 } from 'js-base64';
|
|
4
4
|
import contact from "../../../common/imgs/contact.png";
|
|
5
|
-
var SUPPORTED_PLATFORMS = [0, 2, 3, 5, 6];
|
|
5
|
+
var SUPPORTED_PLATFORMS = [0, 2, 3, 5, 6, 24];
|
|
6
6
|
var platformTypeMap = {
|
|
7
7
|
0: 1,
|
|
8
8
|
// 淘宝
|
|
@@ -21,16 +21,23 @@ export var openCustomerDialog = function openCustomerDialog(_ref) {
|
|
|
21
21
|
var shopName = _ref.shopName,
|
|
22
22
|
platformType = _ref.platformType,
|
|
23
23
|
orderNumber = _ref.orderNumber,
|
|
24
|
+
buyer = _ref.buyer,
|
|
24
25
|
onJumpPage = _ref.onJumpPage;
|
|
25
26
|
var type = platformTypeMap[platformType];
|
|
26
27
|
if (!type) return;
|
|
28
|
+
var param = {
|
|
29
|
+
platformType: type,
|
|
30
|
+
shop: shopName,
|
|
31
|
+
order_number: orderNumber
|
|
32
|
+
};
|
|
33
|
+
|
|
34
|
+
// 京东、拼多多、抖音平台添加 buyer 参数
|
|
35
|
+
if ([2, 3, 6].includes(platformType)) {
|
|
36
|
+
param.buyer = buyer;
|
|
37
|
+
}
|
|
27
38
|
var params = {
|
|
28
39
|
event: 'open_buyers',
|
|
29
|
-
param:
|
|
30
|
-
platformType: type,
|
|
31
|
-
shop: shopName,
|
|
32
|
-
order_number: orderNumber
|
|
33
|
-
}
|
|
40
|
+
param: param
|
|
34
41
|
};
|
|
35
42
|
console.log(params);
|
|
36
43
|
var jsonString = JSON.stringify(params);
|
|
@@ -44,6 +51,7 @@ var JumpCustomerIcon = function JumpCustomerIcon(_ref2) {
|
|
|
44
51
|
var tid = _ref2.tid,
|
|
45
52
|
shopName = _ref2.shopName,
|
|
46
53
|
platformType = _ref2.platformType,
|
|
54
|
+
buyer = _ref2.buyer,
|
|
47
55
|
onJumpPage = _ref2.onJumpPage;
|
|
48
56
|
if (!tid || !SUPPORTED_PLATFORMS.includes(platformType)) {
|
|
49
57
|
return null;
|
|
@@ -53,6 +61,7 @@ var JumpCustomerIcon = function JumpCustomerIcon(_ref2) {
|
|
|
53
61
|
shopName: shopName,
|
|
54
62
|
platformType: platformType,
|
|
55
63
|
orderNumber: tid,
|
|
64
|
+
buyer: buyer,
|
|
56
65
|
onJumpPage: onJumpPage
|
|
57
66
|
});
|
|
58
67
|
};
|
|
@@ -62,12 +71,13 @@ var JumpCustomerIcon = function JumpCustomerIcon(_ref2) {
|
|
|
62
71
|
onClick: handleClick,
|
|
63
72
|
style: {
|
|
64
73
|
cursor: 'pointer',
|
|
65
|
-
|
|
74
|
+
position: 'relative',
|
|
75
|
+
top: '-2px'
|
|
66
76
|
}
|
|
67
77
|
}, /*#__PURE__*/React.createElement(Image, {
|
|
68
78
|
src: contact,
|
|
69
79
|
preview: false,
|
|
70
|
-
width:
|
|
80
|
+
width: 14
|
|
71
81
|
})));
|
|
72
82
|
};
|
|
73
83
|
export default JumpCustomerIcon;
|
|
@@ -62,7 +62,7 @@ import JumpCustomerIcon from "./components/XiaozhiConversation";
|
|
|
62
62
|
var Text = Typography.Text,
|
|
63
63
|
Link = Typography.Link;
|
|
64
64
|
var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
65
|
-
var _currentNodeDetail$wo, _currentNodeDetail$no, _document, _document$cookie, _currentNodeDetail$wo2, _currentNodeDetail$no16, _shopList$find, _currentNodeDetail$no29, _currentNodeDetail$no30, _currentNodeDetail$wo29, _currentNodeDetail$wo30,
|
|
65
|
+
var _currentNodeDetail$wo, _currentNodeDetail$no, _document, _document$cookie, _currentNodeDetail$wo2, _currentNodeDetail$no16, _shopList$find, _currentNodeDetail$no29, _currentNodeDetail$no30, _currentNodeDetail$wo29, _currentNodeDetail$wo30, _currentNodeDetail$wo31, _JSON$parse, _currentNodeDetail$wo32, _currentNodeDetail$wo33, _currentNodeDetail$wo34, _currentNodeDetail$wo35, _currentNodeDetail$wo36, _currentNodeDetail$no31, _currentNodeDetail$no32;
|
|
66
66
|
var flowTemplateKey = props.flowTemplateKey,
|
|
67
67
|
_props$shopList = props.shopList,
|
|
68
68
|
shopList = _props$shopList === void 0 ? [] : _props$shopList,
|
|
@@ -1383,7 +1383,8 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
1383
1383
|
header: /*#__PURE__*/React.createElement(React.Fragment, null, flowWorkOrderId && /*#__PURE__*/React.createElement("div", {
|
|
1384
1384
|
style: {
|
|
1385
1385
|
display: 'flex',
|
|
1386
|
-
justifyContent: 'space-between'
|
|
1386
|
+
justifyContent: 'space-between',
|
|
1387
|
+
alignItems: 'center'
|
|
1387
1388
|
}
|
|
1388
1389
|
}, /*#__PURE__*/React.createElement("div", null, [PlatForm.PC, PlatForm.WEB].includes(plat.platform) && /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement(PlatformAvatar, {
|
|
1389
1390
|
type: shopItem === null || shopItem === void 0 ? void 0 : shopItem.shopSource,
|
|
@@ -1393,22 +1394,23 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
1393
1394
|
}), shopItem === null || shopItem === void 0 ? void 0 : shopItem.shopName, "-"), /*#__PURE__*/React.createElement("span", null, flowWorkOrderId), !['created', 'edit'].includes(privilege) && /*#__PURE__*/React.createElement(Button, {
|
|
1394
1395
|
type: "link",
|
|
1395
1396
|
onClick: handleFollow
|
|
1396
|
-
}, !follow ? '关注' : '已关注'), plat.platform === PlatForm.PC && shopItem && !shopItem.notJoin && /*#__PURE__*/React.createElement(JumpCustomerIcon, {
|
|
1397
|
+
}, !follow ? '关注' : '已关注'), plat.platform === PlatForm.PC && shopItem && !shopItem.notJoin && !readonly && /*#__PURE__*/React.createElement(JumpCustomerIcon, {
|
|
1397
1398
|
tid: tid,
|
|
1398
1399
|
shopName: shopItem.shopSource == 0 ? shopItem.thirdUserNick : shopItem.shopName,
|
|
1399
1400
|
platformType: shopItem.shopSource,
|
|
1401
|
+
buyer: (otherInfo === null || otherInfo === void 0 ? void 0 : otherInfo.buyerOpenUid) || (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo29 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo29 === void 0 ? void 0 : _currentNodeDetail$wo29.buyerOpenUid),
|
|
1400
1402
|
onJumpPage: onJumpPage
|
|
1401
1403
|
}), showImplementationEnter && /*#__PURE__*/React.createElement(Button, {
|
|
1402
1404
|
onClick: openFeedbackModal,
|
|
1403
1405
|
type: "link"
|
|
1404
|
-
}, "\u5FEB\u901F\u521B\u5EFA\u5B9E\u65BD\u5DE5\u5355"), plat.platform === PlatForm.XIAOZHI && ['2'].includes(String(otherInfo === null || otherInfo === void 0 ? void 0 : otherInfo.xzClientPlatformType)) && ((otherInfo === null || otherInfo === void 0 ? void 0 : otherInfo.buyerOpenUid) || (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
1406
|
+
}, "\u5FEB\u901F\u521B\u5EFA\u5B9E\u65BD\u5DE5\u5355"), plat.platform === PlatForm.XIAOZHI && ['2'].includes(String(otherInfo === null || otherInfo === void 0 ? void 0 : otherInfo.xzClientPlatformType)) && ((otherInfo === null || otherInfo === void 0 ? void 0 : otherInfo.buyerOpenUid) || (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo30 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo30 === void 0 ? void 0 : _currentNodeDetail$wo30.buyerOpenUid)) && /*#__PURE__*/React.createElement(JumpBuyer, {
|
|
1405
1407
|
order_number: tid,
|
|
1406
1408
|
shop: (otherInfo === null || otherInfo === void 0 ? void 0 : otherInfo.taobaoNick) || '',
|
|
1407
|
-
buyer: (otherInfo === null || otherInfo === void 0 ? void 0 : otherInfo.buyerOpenUid) || (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
1409
|
+
buyer: (otherInfo === null || otherInfo === void 0 ? void 0 : otherInfo.buyerOpenUid) || (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo31 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo31 === void 0 ? void 0 : _currentNodeDetail$wo31.buyerOpenUid),
|
|
1408
1410
|
platformType: otherInfo === null || otherInfo === void 0 ? void 0 : otherInfo.xzClientPlatformType
|
|
1409
|
-
})), /*#__PURE__*/React.createElement("div", null, (_JSON$parse = JSON.parse((currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
1411
|
+
})), /*#__PURE__*/React.createElement("div", null, (_JSON$parse = JSON.parse((currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo32 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo32 === void 0 ? void 0 : (_currentNodeDetail$wo33 = _currentNodeDetail$wo32.jsonMap) === null || _currentNodeDetail$wo33 === void 0 ? void 0 : _currentNodeDetail$wo33.flowTags) || '[]')) !== null && _JSON$parse !== void 0 && _JSON$parse.includes('AI_BUILD') ? /*#__PURE__*/React.createElement(Tag, {
|
|
1410
1412
|
color: "blue"
|
|
1411
|
-
}, "AI\u81EA\u52A8\u5EFA\u5355-".concat(WORK_ORDER_STATUS_AI_BUILD[currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
1413
|
+
}, "AI\u81EA\u52A8\u5EFA\u5355-".concat(WORK_ORDER_STATUS_AI_BUILD[currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo34 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo34 === void 0 ? void 0 : (_currentNodeDetail$wo35 = _currentNodeDetail$wo34.jsonMap) === null || _currentNodeDetail$wo35 === void 0 ? void 0 : _currentNodeDetail$wo35.flowStatus])) : null)), flowStatus && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Row, {
|
|
1412
1414
|
justify: 'space-between',
|
|
1413
1415
|
className: "header"
|
|
1414
1416
|
}, /*#__PURE__*/React.createElement(Col, null, /*#__PURE__*/React.createElement("div", {
|
|
@@ -1477,7 +1479,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
1477
1479
|
isSuperAdmin: isSuperAdmin
|
|
1478
1480
|
}));
|
|
1479
1481
|
}), currentNodeDetail && /*#__PURE__*/React.createElement(Timeline.Item, {
|
|
1480
|
-
key: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
1482
|
+
key: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo36 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo36 === void 0 ? void 0 : _currentNodeDetail$wo36.id) || 'current-node'
|
|
1481
1483
|
}, /*#__PURE__*/React.createElement(CurrentNode, {
|
|
1482
1484
|
ref: currentNodeRef,
|
|
1483
1485
|
flowTemplateId: flowTemplateId,
|
|
@@ -40,7 +40,7 @@ export declare const calcWorkOrderList: (source: Partial<WorkOrderDetail>[], tem
|
|
|
40
40
|
workOrderComponentType: string;
|
|
41
41
|
uniqueKey: string;
|
|
42
42
|
}[], type?: string) => any[];
|
|
43
|
-
export declare const orderBack: ({ companyKey, order_no, form, shopId: propsShopid, shopList, templateDetail, type, callback, fromQNCreateWorkOrderByOrderNo, plat, callbackShopId, setLoading, callKey,
|
|
43
|
+
export declare const orderBack: ({ companyKey, order_no, form, shopId: propsShopid, shopList, templateDetail, type, callback, fromQNCreateWorkOrderByOrderNo, plat, callbackShopId, setLoading, callKey, matchLogisticsNo, skipOrderBackUniqueKeys, }: any) => Promise<void>;
|
|
44
44
|
export declare const imgResize: (url: string, w?: number, h?: number) => string;
|
|
45
45
|
export declare const COMPONENT_MAP: {
|
|
46
46
|
[key: string]: string;
|
|
@@ -146,11 +146,11 @@ var getBasicsOrderInfo = function getBasicsOrderInfo(orderInfo, xiaozhiOrder) {
|
|
|
146
146
|
export var orderBack = /*#__PURE__*/function () {
|
|
147
147
|
var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
|
|
148
148
|
var _form$getFieldValue;
|
|
149
|
-
var companyKey, order_no, form, propsShopid, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, callbackShopId, setLoading, callKey,
|
|
149
|
+
var companyKey, order_no, form, propsShopid, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, callbackShopId, setLoading, callKey, matchLogisticsNo, skipOrderBackUniqueKeys, shopId, canModifyShopFieldValue, shouldTryAutoSetShopId, trySetShopId, _res$data, res, _res$data2, _res$data3, JOIN_SHOP, hasFlagMap, _ref4, shopSourceStr, _ref4$thirdUserNick, thirdUserNick, thirdShopMainType, _kmVideoComponent$com, _wdtReturnBillNoCompo, _data$value, _data$value3, _data$value4, _jstOrder$value, _jstOrder$value2, _bsOrder$value, _wlnOrder$value, _wdtOrder$value, _bsE3Order$value, _kmOrder$value, _gyOrder$value, _jyOrder$value, _skxOrder$value, _skxReturnOrder$value, _jkyOrder$value, _wdtReturnOrder$value, _bsOrders$orders, _bsE3Orders$orderList, _wlnOrders$orders, _wdtOrders$trades, _wdtInfo$wdtSystemOrd, _wdtInfo$wdtSystemOrd2, _gyOrders$trades, _jyOrders$trades, _jkyOrders$trades, _kmOrders$orderDetail, _kmInfo$kmSystemOrder, _kmInfo$kmSystemOrder2, _value$selectIds, _value$showOrderInfo, _afterSaleOrders$valu, promise, kmVideoComponent, OrderSubFormComponent, wdtReturnBillNoComponent, _yield$Promise$allSet, _yield$Promise$allSet2, data, afterSaleOrders, xiaozhiOrder, jstOrder, bsOrder, wlnOrder, wdtOrder, bsE3Order, kmOrder, gyOrder, jyOrder, skxOrder, skxReturnOrder, jkyOrder, kmVideoOrder, orderSubFormOrder, wdtReturnOrder, _data$value2, orderInfo, jstOrders, bsOrders, wlnOrders, wdtOrders, bsE3Orders, kmOrders, gyOrders, jyOrders, skxOrders, skxReturnOrders, jkyOrders, wdtReturnOrders, bsInfo, wlnInfo, bsE3Info, wdtInfo, kmInfo, orderSubFormInfo, gyInfo, jyInfo, jkyInfo, jstInfo, skxInfo, skxReturnInfo, formValue, afterSalesOrderField, value, afterSalesOrderSelectOrder, afterSaleOrderInfo, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, hasSigningDatetime, _signDatetime$data, signDatetime, values, paymentUniqueKey;
|
|
150
150
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
151
151
|
while (1) switch (_context.prev = _context.next) {
|
|
152
152
|
case 0:
|
|
153
|
-
companyKey = _ref.companyKey, order_no = _ref.order_no, form = _ref.form, propsShopid = _ref.shopId, shopList = _ref.shopList, templateDetail = _ref.templateDetail, _ref$type = _ref.type, type = _ref$type === void 0 ? 'add' : _ref$type, callback = _ref.callback, fromQNCreateWorkOrderByOrderNo = _ref.fromQNCreateWorkOrderByOrderNo, _ref$plat = _ref.plat, plat = _ref$plat === void 0 ? {} : _ref$plat, callbackShopId = _ref.callbackShopId, setLoading = _ref.setLoading, callKey = _ref.callKey,
|
|
153
|
+
companyKey = _ref.companyKey, order_no = _ref.order_no, form = _ref.form, propsShopid = _ref.shopId, shopList = _ref.shopList, templateDetail = _ref.templateDetail, _ref$type = _ref.type, type = _ref$type === void 0 ? 'add' : _ref$type, callback = _ref.callback, fromQNCreateWorkOrderByOrderNo = _ref.fromQNCreateWorkOrderByOrderNo, _ref$plat = _ref.plat, plat = _ref$plat === void 0 ? {} : _ref$plat, callbackShopId = _ref.callbackShopId, setLoading = _ref.setLoading, callKey = _ref.callKey, matchLogisticsNo = _ref.matchLogisticsNo, skipOrderBackUniqueKeys = _ref.skipOrderBackUniqueKeys;
|
|
154
154
|
console.log('orderBack-run--', callKey, templateDetail);
|
|
155
155
|
shopId = propsShopid;
|
|
156
156
|
canModifyShopFieldValue = form === null || form === void 0 ? void 0 : (_form$getFieldValue = form.getFieldValue) === null || _form$getFieldValue === void 0 ? void 0 : _form$getFieldValue.call(form, FIXED_FIELD_CAN_MODIFY_SHOP);
|
|
@@ -421,7 +421,10 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
421
421
|
detail: bsOrders || {}
|
|
422
422
|
});
|
|
423
423
|
wlnInfo = wlnOrders && wlnOrderTransform(_objectSpread(_objectSpread({}, wlnOrders), {}, {
|
|
424
|
-
allOrders: wlnOrders.orders
|
|
424
|
+
allOrders: wlnOrders.orders,
|
|
425
|
+
trades: wlnOrders.orders,
|
|
426
|
+
orderNo: order_no,
|
|
427
|
+
componentList: templateDetail.componentDtoList
|
|
425
428
|
}), form);
|
|
426
429
|
bsE3Info = bsE3Orders && bsE3OrderTransform(_objectSpread(_objectSpread({}, bsE3Orders), {}, {
|
|
427
430
|
componentList: templateDetail.componentDtoList,
|
|
@@ -433,12 +436,13 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
433
436
|
orderNo: order_no,
|
|
434
437
|
allOrders: (wdtOrders === null || wdtOrders === void 0 ? void 0 : wdtOrders.trades) || [],
|
|
435
438
|
wdtReturnOrders: (wdtReturnOrders === null || wdtReturnOrders === void 0 ? void 0 : wdtReturnOrders.orderList) || [],
|
|
436
|
-
matchLogisticsNo:
|
|
439
|
+
matchLogisticsNo: matchLogisticsNo
|
|
437
440
|
}), form);
|
|
438
441
|
kmInfo = kmOrders && kmOrderTransform(_objectSpread(_objectSpread({}, kmOrders), {}, {
|
|
439
442
|
allOrders: (kmOrders === null || kmOrders === void 0 ? void 0 : kmOrders.orderDetailDtoList) || (kmOrders === null || kmOrders === void 0 ? void 0 : kmOrders.trades),
|
|
440
443
|
order_no: order_no,
|
|
441
|
-
componentList: templateDetail.componentDtoList
|
|
444
|
+
componentList: templateDetail.componentDtoList,
|
|
445
|
+
matchLogisticsNo: matchLogisticsNo
|
|
442
446
|
}), form);
|
|
443
447
|
if (kmInfo) {
|
|
444
448
|
kmInfo.kmVideo = kmVideoOrder === null || kmVideoOrder === void 0 ? void 0 : kmVideoOrder.value;
|
|
@@ -521,7 +525,7 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
521
525
|
sendName: ''
|
|
522
526
|
}];
|
|
523
527
|
}
|
|
524
|
-
if ((wdtOrders === null || wdtOrders === void 0 ? void 0 : (_wdtOrders$trades = wdtOrders.trades) === null || _wdtOrders$trades === void 0 ? void 0 : _wdtOrders$trades.length) > 1) {
|
|
528
|
+
if ((wdtOrders === null || wdtOrders === void 0 ? void 0 : (_wdtOrders$trades = wdtOrders.trades) === null || _wdtOrders$trades === void 0 ? void 0 : _wdtOrders$trades.length) > 1 && !(wdtInfo !== null && wdtInfo !== void 0 && (_wdtInfo$wdtSystemOrd = wdtInfo.wdtSystemOrder) !== null && _wdtInfo$wdtSystemOrd !== void 0 && (_wdtInfo$wdtSystemOrd2 = _wdtInfo$wdtSystemOrd.selectIds) !== null && _wdtInfo$wdtSystemOrd2 !== void 0 && _wdtInfo$wdtSystemOrd2.length)) {
|
|
525
529
|
wdtInfo.wdtGoods = _objectSpread(_objectSpread({}, wdtInfo.wdtGoods), {}, {
|
|
526
530
|
wdtGoods: [],
|
|
527
531
|
orders: []
|
|
@@ -580,7 +584,7 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
580
584
|
sendName: ''
|
|
581
585
|
}];
|
|
582
586
|
}
|
|
583
|
-
if ((kmOrders === null || kmOrders === void 0 ? void 0 : (_kmOrders$orderDetail = kmOrders.orderDetailDtoList) === null || _kmOrders$orderDetail === void 0 ? void 0 : _kmOrders$orderDetail.length) > 1) {
|
|
587
|
+
if ((kmOrders === null || kmOrders === void 0 ? void 0 : (_kmOrders$orderDetail = kmOrders.orderDetailDtoList) === null || _kmOrders$orderDetail === void 0 ? void 0 : _kmOrders$orderDetail.length) > 1 && !(kmInfo !== null && kmInfo !== void 0 && (_kmInfo$kmSystemOrder = kmInfo.kmSystemOrder) !== null && _kmInfo$kmSystemOrder !== void 0 && (_kmInfo$kmSystemOrder2 = _kmInfo$kmSystemOrder.selectIds) !== null && _kmInfo$kmSystemOrder2 !== void 0 && _kmInfo$kmSystemOrder2.length)) {
|
|
584
588
|
kmInfo.kmSendGood = [{
|
|
585
589
|
sendId: '',
|
|
586
590
|
sendName: ''
|
|
@@ -1357,18 +1361,20 @@ export var wlnSystemOrderBackValues = function wlnSystemOrderBackValues(_ref11)
|
|
|
1357
1361
|
form = _ref11.form;
|
|
1358
1362
|
//如果没有选择的值不返填,会有两种情况 1.有值为空 2.没有值 为空的时候需要返填
|
|
1359
1363
|
if (!(value !== null && value !== void 0 && value.selectedRows)) return;
|
|
1360
|
-
var
|
|
1364
|
+
var wlnGoodsComponent = (_templateList$compone6 = templateList.componentDtoList) === null || _templateList$compone6 === void 0 ? void 0 : _templateList$compone6.filter(function (item) {
|
|
1361
1365
|
return ['WLN_GOODS', 'WLN_SEND_GOOD', 'WLN_LOGISTICS'].includes(item.workOrderComponentType);
|
|
1362
1366
|
});
|
|
1363
|
-
if (!(
|
|
1364
|
-
var wlnGoodsValue = form.getFieldValue(
|
|
1367
|
+
if (!(wlnGoodsComponent !== null && wlnGoodsComponent !== void 0 && wlnGoodsComponent.length)) return;
|
|
1368
|
+
var wlnGoodsValue = form.getFieldValue(wlnGoodsComponent[0].uniqueKey);
|
|
1365
1369
|
var orderInfo = wlnOrderTransform({
|
|
1370
|
+
trades: value.selectedRows,
|
|
1366
1371
|
orders: value.selectedRows,
|
|
1367
1372
|
shopCode: wlnGoodsValue.shopCode,
|
|
1368
|
-
allOrders: value === null || value === void 0 ? void 0 : value.orders
|
|
1373
|
+
allOrders: value === null || value === void 0 ? void 0 : value.orders,
|
|
1374
|
+
componentList: templateList.componentDtoList
|
|
1369
1375
|
}, form);
|
|
1370
1376
|
var values = wlnOrderBackFormValues(orderInfo, {
|
|
1371
|
-
componentDtoList:
|
|
1377
|
+
componentDtoList: wlnGoodsComponent
|
|
1372
1378
|
});
|
|
1373
1379
|
form.setFieldsValue(values);
|
|
1374
1380
|
};
|
|
@@ -38,8 +38,23 @@ export var orderBackMap = function orderBackMap(_ref) {
|
|
|
38
38
|
hasWln: {
|
|
39
39
|
flag: HasFilterHandle(templateDetail, orderBackKeyListMap.hasWln),
|
|
40
40
|
promiseRequest: function promiseRequest() {
|
|
41
|
+
var _templateDetail$compo;
|
|
42
|
+
// 是否需要拆分组合商品
|
|
43
|
+
var isSplit = (_templateDetail$compo = templateDetail.componentDtoList) === null || _templateDetail$compo === void 0 ? void 0 : _templateDetail$compo.some(function (item) {
|
|
44
|
+
var _item$componentConfig;
|
|
45
|
+
return ['WLN_GOODS', 'WLN_REISSUE_GOODS'].includes(item.workOrderComponentType) && ((_item$componentConfig = item.componentConfig) === null || _item$componentConfig === void 0 ? void 0 : _item$componentConfig.orderBackGoodsLevel) !== '2';
|
|
46
|
+
});
|
|
41
47
|
return wlnOrderDetail({
|
|
42
|
-
billCode: order_no
|
|
48
|
+
billCode: order_no,
|
|
49
|
+
isSplit: isSplit
|
|
50
|
+
}).then(function (data) {
|
|
51
|
+
if (data !== null && data !== void 0 && data.success) {
|
|
52
|
+
var _data$data;
|
|
53
|
+
if ((_data$data = data.data) !== null && _data$data !== void 0 && _data$data.tradeNo) {
|
|
54
|
+
data.data.tradeNo = order_no;
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
return data;
|
|
43
58
|
});
|
|
44
59
|
}
|
|
45
60
|
},
|
|
@@ -65,11 +80,11 @@ export var orderBackMap = function orderBackMap(_ref) {
|
|
|
65
80
|
hasKm: {
|
|
66
81
|
flag: HasFilterHandle(templateDetail, orderBackKeyListMap.hasKm),
|
|
67
82
|
promiseRequest: function promiseRequest() {
|
|
68
|
-
var _templateDetail$
|
|
83
|
+
var _templateDetail$compo2;
|
|
69
84
|
// 是否需要明细的系统主商家编码
|
|
70
|
-
var needDetailSysItemOuterId = (_templateDetail$
|
|
71
|
-
var _item$
|
|
72
|
-
return ['KM_GOODS', 'KM_REISSUE_GOODS', 'KM_RETURN_GOODS'].includes(item.workOrderComponentType) && ((_item$
|
|
85
|
+
var needDetailSysItemOuterId = (_templateDetail$compo2 = templateDetail.componentDtoList) === null || _templateDetail$compo2 === void 0 ? void 0 : _templateDetail$compo2.some(function (item) {
|
|
86
|
+
var _item$componentConfig2;
|
|
87
|
+
return ['KM_GOODS', 'KM_REISSUE_GOODS', 'KM_RETURN_GOODS'].includes(item.workOrderComponentType) && ((_item$componentConfig2 = item.componentConfig) === null || _item$componentConfig2 === void 0 ? void 0 : _item$componentConfig2.orderBackGoodsLevel) !== '2';
|
|
73
88
|
});
|
|
74
89
|
return kmOrderDetail({
|
|
75
90
|
tid: order_no,
|
|
@@ -1219,6 +1219,28 @@ var processJkyReissueGoods = function processJkyReissueGoods(templateColumns) {
|
|
|
1219
1219
|
};
|
|
1220
1220
|
};
|
|
1221
1221
|
};
|
|
1222
|
+
var processWlnReissueGoods = function processWlnReissueGoods(templateColumns) {
|
|
1223
|
+
return function (getValue) {
|
|
1224
|
+
return function (nex, config) {
|
|
1225
|
+
var orderNo = '';
|
|
1226
|
+
var tradeId = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
|
|
1227
|
+
return col.workOrderComponentType === 'TRADE_ID_INPUT';
|
|
1228
|
+
});
|
|
1229
|
+
if (tradeId) {
|
|
1230
|
+
orderNo = getValue("".concat(tradeId.uniqueKey, "_").concat(updateWorkTypeKeys[tradeId.workOrderComponentType]));
|
|
1231
|
+
}
|
|
1232
|
+
return _defineProperty({}, nex.uniqueKey, {
|
|
1233
|
+
wlnSystemOrder: {
|
|
1234
|
+
orderNo: orderNo
|
|
1235
|
+
},
|
|
1236
|
+
wlnReissueType: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_wlnReissueType")), !isNull(config === null || config === void 0 ? void 0 : config.initReason) ? [config.initReason] : ['1']),
|
|
1237
|
+
wlnReissueGoods: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_wlnReissueGoods")), []),
|
|
1238
|
+
shopCode: getValue("".concat(nex.uniqueKey, "_shopCode")),
|
|
1239
|
+
wlnSystemOrderNo: getValue("".concat(nex.uniqueKey, "_wlnSystemOrderNo"))
|
|
1240
|
+
});
|
|
1241
|
+
};
|
|
1242
|
+
};
|
|
1243
|
+
};
|
|
1222
1244
|
var processGyReissueGoods = function processGyReissueGoods(templateColumns) {
|
|
1223
1245
|
return function (getValue) {
|
|
1224
1246
|
return function (nex, config) {
|
|
@@ -1312,14 +1334,14 @@ var processJstReturnGoods = function processJstReturnGoods(templateColumns) {
|
|
|
1312
1334
|
};
|
|
1313
1335
|
var processLabel = function processLabel(getValue) {
|
|
1314
1336
|
return function (nex, config) {
|
|
1315
|
-
var
|
|
1316
|
-
return
|
|
1337
|
+
var _ref86;
|
|
1338
|
+
return _ref86 = {}, _defineProperty(_ref86, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _defineProperty(_ref86, "".concat(nex.uniqueKey, "_label"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _ref86;
|
|
1317
1339
|
};
|
|
1318
1340
|
};
|
|
1319
1341
|
var processMemberLevel = function processMemberLevel(getValue) {
|
|
1320
1342
|
return function (nex, config) {
|
|
1321
|
-
var
|
|
1322
|
-
return
|
|
1343
|
+
var _ref87;
|
|
1344
|
+
return _ref87 = {}, _defineProperty(_ref87, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _defineProperty(_ref87, "".concat(nex.uniqueKey, "_memberLevel"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _ref87;
|
|
1323
1345
|
};
|
|
1324
1346
|
};
|
|
1325
1347
|
var processAfterSalesOrderId = function processAfterSalesOrderId(getValue) {
|
|
@@ -1387,7 +1409,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
|
|
|
1387
1409
|
SUBFORM: processSubForm,
|
|
1388
1410
|
ERP_AFTER_SALES_ORDER_REVIEW_STATUS: processCallBackStatus,
|
|
1389
1411
|
WLN_WAREHOUSING_STATUS: processSceneStatus,
|
|
1390
|
-
WLN_REISSUE_GOODS:
|
|
1412
|
+
WLN_REISSUE_GOODS: processWlnReissueGoods(templateColumns),
|
|
1391
1413
|
EXPRESS_LOGISTICS_SELECT: processExpressLogisticsSelect,
|
|
1392
1414
|
RETURN_LOGISTICS_SELECT: processReturnLogisticsSelect,
|
|
1393
1415
|
REMARK_INPUT: processRemarkInput,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kmkf-fe-packages/kmkf-work-order-service-component",
|
|
3
|
-
"version": "2.7.3-beta.
|
|
3
|
+
"version": "2.7.3-beta.10",
|
|
4
4
|
"module": "dist/esm/index.js",
|
|
5
5
|
"typings": "dist/esm/index.d.ts",
|
|
6
6
|
"files": [
|
|
@@ -32,9 +32,9 @@
|
|
|
32
32
|
},
|
|
33
33
|
"dependencies": {
|
|
34
34
|
"@ant-design/icons": "^4.7.0",
|
|
35
|
-
"@kmkf-fe-packages/basic-components": "2.7.3-beta.
|
|
36
|
-
"@kmkf-fe-packages/kmkf-utils": "2.7.3-beta.
|
|
37
|
-
"@kmkf-fe-packages/services-components": "2.7.3-beta.
|
|
35
|
+
"@kmkf-fe-packages/basic-components": "2.7.3-beta.10",
|
|
36
|
+
"@kmkf-fe-packages/kmkf-utils": "2.7.3-beta.10",
|
|
37
|
+
"@kmkf-fe-packages/services-components": "2.7.3-beta.10",
|
|
38
38
|
"@reduxjs/toolkit": "^1.8.5",
|
|
39
39
|
"ahooks": "^3.7.4",
|
|
40
40
|
"copy-to-clipboard": "^3.3.3",
|
|
@@ -75,7 +75,7 @@
|
|
|
75
75
|
"publishConfig": {
|
|
76
76
|
"access": "public"
|
|
77
77
|
},
|
|
78
|
-
"gitHead": "
|
|
78
|
+
"gitHead": "a3b928789d7e0dcdba730abd31155cdfbeeb1709",
|
|
79
79
|
"gitHooks": {
|
|
80
80
|
"pre-commit": "lint-staged"
|
|
81
81
|
}
|