@kmkf-fe-packages/kmkf-work-order-service-component 2.6.1-beta.0 → 2.6.1-beta.3
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/common.js +1 -1
- package/dist/esm/FlowTemplateDetailV2/components/CurrentNode/index.d.ts +1 -0
- package/dist/esm/FlowTemplateDetailV2/components/CurrentNode/index.js +13 -10
- package/dist/esm/FlowTemplateDetailV2/components/FormRender/index.d.ts +1 -0
- package/dist/esm/FlowTemplateDetailV2/components/FormRender/index.js +22 -6
- package/dist/esm/FlowTemplateDetailV2/index.js +18 -15
- package/dist/esm/common/constant.d.ts +5 -29
- package/dist/esm/common/constant.js +21 -12
- package/dist/esm/common/utils/constant.js +7 -0
- package/dist/esm/common/utils/submitDataTransOldFormat.js +5 -0
- package/dist/esm/common/utils/tools.d.ts +1 -0
- package/dist/esm/common/utils/tools.js +183 -137
- package/dist/esm/common/utils/transformWorkOrderData.js +15 -2
- package/dist/esm/model/servers/api.d.ts +4 -0
- package/dist/esm/model/servers/api.js +10 -0
- package/package.json +3 -3
|
@@ -40,7 +40,7 @@ export var FLOW_STATUS_V2 = {
|
|
|
40
40
|
RETURNING: '回退中'
|
|
41
41
|
};
|
|
42
42
|
//不能回填的组件type
|
|
43
|
-
export var CANNOT_BACK_FILL = ['LOGISTICS_TRAJECTORY', 'LOGISTICS_TRAJECTORY_MORE', 'BUYER_MESSAGE_NOTICE', 'MSG_STATUS', 'NEW_PAYMENT_STATUS', 'REISSUE_STATUS', 'REISSUE_LOGISTICS', 'RETURN_GOODS_STATUS', 'RETURN_GOODS_TRADE_ID', 'ADJUST_WORK_ORDER_STATUS', 'INVOICE_STATUS', 'INVOICING_STATUS', 'EXCHANGE_STATUS', 'WAREHOUSING_STATUS', 'BS_E3_WAREHOUSING_STATUS', 'WDT_WAREHOUSING_STATUS', 'JKY_WAREHOUSING_STATUS', 'EXCHANGE_TRADE_ID', 'REISSUE_TRADE_ID', 'ERP_AFTER_SALE_TRADE_ID', 'LOGISTICS_INTERCEPTION', 'LOGISTICS_INTERCEPTION_MORE', 'ORDER_TYPE', 'REFUND_TYPE', 'RETURN_EXCHANGE_GOODS_REVIEW_STATUS', 'EXECUTE_ACTION_TYPE'];
|
|
43
|
+
export var CANNOT_BACK_FILL = ['LOGISTICS_TRAJECTORY', 'LOGISTICS_TRAJECTORY_MORE', 'BUYER_MESSAGE_NOTICE', 'MSG_STATUS', 'NEW_PAYMENT_STATUS', 'REISSUE_STATUS', 'REISSUE_LOGISTICS', 'RETURN_GOODS_STATUS', 'RETURN_GOODS_TRADE_ID', 'ADJUST_WORK_ORDER_STATUS', 'INVOICE_STATUS', 'INVOICING_STATUS', 'EXCHANGE_STATUS', 'WAREHOUSING_STATUS', 'BS_E3_WAREHOUSING_STATUS', 'WDT_WAREHOUSING_STATUS', 'JKY_WAREHOUSING_STATUS', 'EXCHANGE_TRADE_ID', 'REISSUE_TRADE_ID', 'SWAP_OUT_TRADE_ID', 'ERP_AFTER_SALE_TRADE_ID', 'LOGISTICS_INTERCEPTION', 'LOGISTICS_INTERCEPTION_MORE', 'ORDER_TYPE', 'REFUND_TYPE', 'RETURN_EXCHANGE_GOODS_REVIEW_STATUS', 'EXECUTE_ACTION_TYPE'];
|
|
44
44
|
export var verifyHandle = function verifyHandle(data, componentDtoList) {
|
|
45
45
|
var _componentDtoList$fin, _componentDtoList$fin2, _data$paymentUniqueKe, _data$paymentUniqueKe2;
|
|
46
46
|
var res = {
|
|
@@ -14,6 +14,7 @@ declare type CurrentNodeProps = {
|
|
|
14
14
|
queryRemarkList: () => void;
|
|
15
15
|
autoSubmit?: boolean;
|
|
16
16
|
isSuperAdmin?: boolean;
|
|
17
|
+
autoFillThirdPartyFields?: boolean;
|
|
17
18
|
};
|
|
18
19
|
declare const _default: React.ForwardRefExoticComponent<CurrentNodeProps & React.RefAttributes<unknown>>;
|
|
19
20
|
export default _default;
|
|
@@ -69,7 +69,8 @@ var CurrentNode = function CurrentNode(props, ref) {
|
|
|
69
69
|
flowWorkOrderId = props.flowWorkOrderId,
|
|
70
70
|
queryRemarkList = props.queryRemarkList,
|
|
71
71
|
autoSubmit = props.autoSubmit,
|
|
72
|
-
onJumpPage = props.onJumpPage
|
|
72
|
+
onJumpPage = props.onJumpPage,
|
|
73
|
+
autoFillThirdPartyFields = props.autoFillThirdPartyFields;
|
|
73
74
|
var _useContext = useContext(Context),
|
|
74
75
|
dispatch = _useContext.dispatch;
|
|
75
76
|
// 是否是编辑状态
|
|
@@ -284,20 +285,23 @@ var CurrentNode = function CurrentNode(props, ref) {
|
|
|
284
285
|
return _ref2.apply(this, arguments);
|
|
285
286
|
};
|
|
286
287
|
}();
|
|
288
|
+
var eventType = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$fl = currentNodeDetail.flowEventData) === null || _currentNodeDetail$fl === void 0 ? void 0 : _currentNodeDetail$fl.eventType;
|
|
289
|
+
var eventConfig = SKIP_NODE_TYPES_CONFIG[eventType];
|
|
290
|
+
var shouldSkipByValidate = typeof eventConfig === 'boolean' || !(eventConfig !== null && eventConfig !== void 0 && eventConfig.validateFn) || eventConfig.validateFn(currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.nodeInfo);
|
|
291
|
+
var showSkipButton = eventType in SKIP_NODE_TYPES_CONFIG && flowStatus && [FlowStatus.FLOWING, FlowStatus.PROCESSING].includes(flowStatus) && shouldSkipByValidate;
|
|
287
292
|
var handleSkip = /*#__PURE__*/function () {
|
|
288
293
|
var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
|
|
289
|
-
var title
|
|
294
|
+
var title;
|
|
290
295
|
return _regeneratorRuntime().wrap(function _callee4$(_context4) {
|
|
291
296
|
while (1) switch (_context4.prev = _context4.next) {
|
|
292
297
|
case 0:
|
|
293
298
|
title = '当前获取物流单号自动化任务正在执行中,确定要跳过吗?跳过后将无法获取物流信息';
|
|
294
|
-
|
|
295
|
-
if (typeof config !== 'boolean') {
|
|
299
|
+
if (typeof eventConfig !== 'boolean') {
|
|
296
300
|
title = /*#__PURE__*/React.createElement(React.Fragment, null, "\u5F53\u524D", /*#__PURE__*/React.createElement("span", {
|
|
297
301
|
className: styles.highlight
|
|
298
|
-
},
|
|
302
|
+
}, eventConfig.name), "\u81EA\u52A8\u5316\u4EFB\u52A1\u6B63\u5728\u6267\u884C\u4E2D\uFF0C\u786E\u5B9A\u8981\u8DF3\u8FC7\u5417\uFF1F\u8DF3\u8FC7\u540E\u5C06\u65E0\u6CD5\u83B7\u53D6", /*#__PURE__*/React.createElement("span", {
|
|
299
303
|
className: styles.highlight
|
|
300
|
-
},
|
|
304
|
+
}, eventConfig.tips));
|
|
301
305
|
}
|
|
302
306
|
Modal.confirm({
|
|
303
307
|
title: title,
|
|
@@ -345,7 +349,7 @@ var CurrentNode = function CurrentNode(props, ref) {
|
|
|
345
349
|
return onOk;
|
|
346
350
|
}()
|
|
347
351
|
});
|
|
348
|
-
case
|
|
352
|
+
case 3:
|
|
349
353
|
case "end":
|
|
350
354
|
return _context4.stop();
|
|
351
355
|
}
|
|
@@ -357,13 +361,11 @@ var CurrentNode = function CurrentNode(props, ref) {
|
|
|
357
361
|
}();
|
|
358
362
|
var isArtificialNode = tag === 'artificial';
|
|
359
363
|
var isAutoNode = tag === 'auto';
|
|
360
|
-
var eventType = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$fl = currentNodeDetail.flowEventData) === null || _currentNodeDetail$fl === void 0 ? void 0 : _currentNodeDetail$fl.eventType;
|
|
361
364
|
var isShowAutoNodeDetail = isAutoNode && ['ORDER_MEMO_MANY_RULES', 'AFTER_SALE_AUTO_RETURN_GOODS_AGREE_REJECT', 'AFTER_SALE_AUTO_REFUND_REJECT', 'LOGISTICS_INTERCEPT_MULTI_RULE', 'MESSAGE_NOTIFY_EVENT', 'DING_TALK_ROBOT_NOTIFY', 'HTTP_INVOKE', 'ORDER_MEMO', 'LBDJ_ONE_PRICE_ORDER'].includes(eventType);
|
|
362
365
|
var showEdit = isArtificialNode && isCurrentNodeHandler && !readonly && (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo12 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo12 === void 0 ? void 0 : _currentNodeDetail$wo12.flowStatus) === FlowStatus.COMPLETED;
|
|
363
366
|
// TODO: 决策节点给后端修复数据加了一个入口
|
|
364
367
|
// @ts-ignore
|
|
365
368
|
var showRestartAutoTask = tag === 'auto' && flowStatus === FlowStatus.PROCESSING || tag === 'judge' && ((_localStorage = localStorage) === null || _localStorage === void 0 ? void 0 : _localStorage.getItem('__isDEV__')) === 'true';
|
|
366
|
-
var showSkipButton = eventType in SKIP_NODE_TYPES_CONFIG && flowStatus && [FlowStatus.FLOWING, FlowStatus.PROCESSING].includes(flowStatus);
|
|
367
369
|
return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Header, {
|
|
368
370
|
tag: tag,
|
|
369
371
|
nodeName: nodeName,
|
|
@@ -417,7 +419,8 @@ var CurrentNode = function CurrentNode(props, ref) {
|
|
|
417
419
|
flowAllShowHideRules: allShowHideRules,
|
|
418
420
|
isStartNodeWaiting: NodeType.START_NODE === (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no25 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no25 === void 0 ? void 0 : _currentNodeDetail$no25.nodeType) && [NodeStatus.WAITING].includes(currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo23 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo23 === void 0 ? void 0 : _currentNodeDetail$wo23.flowStatus),
|
|
419
421
|
firstOrderBackfill: flowStatus !== FlowStatus.COMPLETED,
|
|
420
|
-
autoSubmit: autoSubmit
|
|
422
|
+
autoSubmit: autoSubmit,
|
|
423
|
+
autoFillThirdPartyFields: autoFillThirdPartyFields
|
|
421
424
|
})), isShowAutoNodeDetail && /*#__PURE__*/React.createElement(AutoTaskDetail, {
|
|
422
425
|
flowEventData: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.flowEventData,
|
|
423
426
|
shopList: shopList
|
|
@@ -33,6 +33,7 @@ declare type FormRenderProps = {
|
|
|
33
33
|
isErpUse?: boolean;
|
|
34
34
|
autoSubmit?: boolean;
|
|
35
35
|
isStartNodeWaiting?: boolean;
|
|
36
|
+
autoFillThirdPartyFields?: boolean;
|
|
36
37
|
};
|
|
37
38
|
declare const _default: React.ForwardRefExoticComponent<FormRenderProps & React.RefAttributes<unknown>>;
|
|
38
39
|
export default _default;
|
|
@@ -29,7 +29,7 @@ import { get, some, set, every, cloneDeep, isEmpty, intersection, throttle, grou
|
|
|
29
29
|
import 'moment/locale/zh-cn';
|
|
30
30
|
import { calcWorkOrderList, orderBack, getReplaceWarnValues, COMPONENT_MAP_NAME, EXCLUDE_REPLACE_TOP_COMPONENT,
|
|
31
31
|
// 重复检验不需要展示在顶部的
|
|
32
|
-
INNER_REPLACE_COMPONENT, reversalFormValues, wdtReturnBillNoBackValues, bsSystemOrderBackValues, kmSystemOrderBackValues, bsE3SystemOrderBackValues, wlnSystemOrderBackValues, gySystemOrderBackValues, jstSystemOrderBackValues, jySystemOrderBackValues, jkySystemOrderBackValues, getMappingConfigByTemplateDetail, wdtSystemOrderBackValues, setLogisticsInfo, getMappingTargetValue } from "../../../common/utils/tools";
|
|
32
|
+
INNER_REPLACE_COMPONENT, reversalFormValues, wdtReturnBillNoBackValues, afterSaleOrderBackValues, bsSystemOrderBackValues, kmSystemOrderBackValues, bsE3SystemOrderBackValues, wlnSystemOrderBackValues, gySystemOrderBackValues, jstSystemOrderBackValues, jySystemOrderBackValues, jkySystemOrderBackValues, getMappingConfigByTemplateDetail, wdtSystemOrderBackValues, setLogisticsInfo, getMappingTargetValue } from "../../../common/utils/tools";
|
|
33
33
|
import { replaceCheck, orderDetail, queryLabelByTradeId, queryMemberLevel } from "../../../model/servers/api";
|
|
34
34
|
import { factory } from '@kmkf-fe-packages/services-components';
|
|
35
35
|
import { getExpression, formatDisplayConfig, isNull, LabelData, setSessionStorage } from '@kmkf-fe-packages/kmkf-utils';
|
|
@@ -95,7 +95,10 @@ var FormRender = function FormRender(props, ref) {
|
|
|
95
95
|
autoSubmit = _props$autoSubmit === void 0 ? false : _props$autoSubmit,
|
|
96
96
|
_props$isStartNodeWai = props.isStartNodeWaiting,
|
|
97
97
|
isStartNodeWaiting = _props$isStartNodeWai === void 0 ? false : _props$isStartNodeWai,
|
|
98
|
-
onJumpPage = props.onJumpPage
|
|
98
|
+
onJumpPage = props.onJumpPage,
|
|
99
|
+
autoFillThirdPartyFields = props.autoFillThirdPartyFields;
|
|
100
|
+
// 优先使用外部传入的 autoFillThirdPartyFields,未传时降级使用 record 中的 notAutoFillWithFirstSubmit
|
|
101
|
+
var notAutoFillFlag = autoFillThirdPartyFields !== undefined ? autoFillThirdPartyFields : record === null || record === void 0 ? void 0 : record.notAutoFillWithFirstSubmit;
|
|
99
102
|
var shopIdToUniqueKeyMap = useMemo(function () {
|
|
100
103
|
var json = {};
|
|
101
104
|
shopList.forEach(function (shop) {
|
|
@@ -198,6 +201,7 @@ var FormRender = function FormRender(props, ref) {
|
|
|
198
201
|
}
|
|
199
202
|
});
|
|
200
203
|
var transData = calcWorkOrderList([record], preNodeComponentDtoList);
|
|
204
|
+
console.log("*** transData:", transData);
|
|
201
205
|
preNodeForm.setFieldsValue(_objectSpread({}, get(transData, '0', {})));
|
|
202
206
|
if (record.preCreateAndNotModified && !record.notAutoFillWithFirstSubmit) {
|
|
203
207
|
fillByShopId(get(transData, '0', {}).shopId);
|
|
@@ -457,11 +461,11 @@ var FormRender = function FormRender(props, ref) {
|
|
|
457
461
|
}));
|
|
458
462
|
console.log('transData', get(transData, '0', {}));
|
|
459
463
|
initialValues = get(transData, '0', {});
|
|
460
|
-
newRecord.preCreateAndNotModified && !
|
|
464
|
+
newRecord.preCreateAndNotModified && !notAutoFillFlag && batchFillByMapping(initialValues);
|
|
461
465
|
orderBackReplace(transData, templateDetail);
|
|
462
466
|
// TODO: 非开始节点录入,都会有workOrderId,这里判断是否有前置组件含有订单号;如果存在订单号,进行订单反填。
|
|
463
467
|
tradeIdUniqueKey = findComponentUniqueKeyByType(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList, 'TRADE_ID_INPUT');
|
|
464
|
-
if (!
|
|
468
|
+
if (!notAutoFillFlag) {
|
|
465
469
|
_context2.next = 47;
|
|
466
470
|
break;
|
|
467
471
|
}
|
|
@@ -660,7 +664,7 @@ var FormRender = function FormRender(props, ref) {
|
|
|
660
664
|
buyerId: buyerId,
|
|
661
665
|
buyerNick: buyerNick
|
|
662
666
|
});
|
|
663
|
-
}, [workOrderId, record, shopId, isErpUse]);
|
|
667
|
+
}, [workOrderId, record, shopId, isErpUse, autoFillThirdPartyFields]);
|
|
664
668
|
|
|
665
669
|
// 重置映射隐藏的组件, 目前只有单选、下拉组件可能会因为映射关系隐藏
|
|
666
670
|
var resetMappingHideComponents = function resetMappingHideComponents() {
|
|
@@ -1022,6 +1026,18 @@ var FormRender = function FormRender(props, ref) {
|
|
|
1022
1026
|
form: form
|
|
1023
1027
|
});
|
|
1024
1028
|
}
|
|
1029
|
+
if (workOrderComponentType === 'PLATFORM_AFTER_SALES_ORDER') {
|
|
1030
|
+
console.log('**** ', {
|
|
1031
|
+
templateList: templateDetail,
|
|
1032
|
+
value: value,
|
|
1033
|
+
form: form
|
|
1034
|
+
});
|
|
1035
|
+
afterSaleOrderBackValues({
|
|
1036
|
+
templateList: templateDetail,
|
|
1037
|
+
value: value,
|
|
1038
|
+
form: form
|
|
1039
|
+
});
|
|
1040
|
+
}
|
|
1025
1041
|
if (activeLogisticsComponents && ['INPUT', 'EXPRESS_LOGISTICS_SELECT', 'BS_LOGISTICS'].includes(workOrderComponentType)) {
|
|
1026
1042
|
setLogisticsInfo({
|
|
1027
1043
|
logisticsMappingConfig: activeLogisticsComponents,
|
|
@@ -1423,7 +1439,7 @@ var FormRender = function FormRender(props, ref) {
|
|
|
1423
1439
|
var _ref8 = (componentConfig === null || componentConfig === void 0 ? void 0 : componentConfig.status) || {},
|
|
1424
1440
|
upgrade = _ref8.upgrade,
|
|
1425
1441
|
created = _ref8.created;
|
|
1426
|
-
if (['REISSUE_TRADE_ID', 'EXCHANGE_TRADE_ID', 'ERP_AFTER_SALE_TRADE_ID'].includes(workOrderComponentType)) {
|
|
1442
|
+
if (['REISSUE_TRADE_ID', 'EXCHANGE_TRADE_ID', 'ERP_AFTER_SALE_TRADE_ID', 'SWAP_OUT_TRADE_ID'].includes(workOrderComponentType)) {
|
|
1427
1443
|
// 售后单id、补发单id和换货单id默认值是可见不可编辑(2)
|
|
1428
1444
|
if (typeof upgrade !== 'number') {
|
|
1429
1445
|
upgrade = 2;
|
|
@@ -61,7 +61,7 @@ import Layout from "./components/Layout";
|
|
|
61
61
|
var Text = Typography.Text,
|
|
62
62
|
Link = Typography.Link;
|
|
63
63
|
var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
64
|
-
var _currentNodeDetail$wo, _currentNodeDetail$no, _document, _document$cookie, _currentNodeDetail$wo2, _currentNodeDetail$no16, _shopList$find, _currentNodeDetail$no29, _currentNodeDetail$no30, _currentNodeDetail$
|
|
64
|
+
var _currentNodeDetail$wo, _currentNodeDetail$no, _document, _document$cookie, _currentNodeDetail$wo2, _currentNodeDetail$no16, _shopList$find, _currentNodeDetail$no29, _currentNodeDetail$no30, _currentNodeDetail$wo29, _currentNodeDetail$wo30, _JSON$parse, _currentNodeDetail$wo31, _currentNodeDetail$wo32, _currentNodeDetail$wo33, _currentNodeDetail$wo34, _currentNodeDetail$wo35, _currentNodeDetail$no31, _currentNodeDetail$no32;
|
|
65
65
|
var flowTemplateKey = props.flowTemplateKey,
|
|
66
66
|
_props$shopList = props.shopList,
|
|
67
67
|
shopList = _props$shopList === void 0 ? [] : _props$shopList,
|
|
@@ -80,6 +80,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
80
80
|
callbackAutoSubmitResult = props.callbackAutoSubmitResult,
|
|
81
81
|
_props$otherInfo = props.otherInfo,
|
|
82
82
|
otherInfo = _props$otherInfo === void 0 ? {} : _props$otherInfo;
|
|
83
|
+
var autoFillThirdPartyFields = otherInfo.autoFillThirdPartyFields;
|
|
83
84
|
var _useContext = useContext(Context),
|
|
84
85
|
dispatch = _useContext.dispatch;
|
|
85
86
|
var flowRecordList = useSelector(selectFlowRecordList);
|
|
@@ -1174,17 +1175,19 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
1174
1175
|
};
|
|
1175
1176
|
useEffect(function () {
|
|
1176
1177
|
if (autoSubmit && !isEmpty(currentNodeDetail)) {
|
|
1177
|
-
var _currentNodeDetail$wo25
|
|
1178
|
+
var _currentNodeDetail$wo25;
|
|
1178
1179
|
// SKX首节点满足下列条件、此时批量提交会等订单数据反填再提交, 其余企业批量提交还是原先逻辑,不涉及订单数据反填
|
|
1179
|
-
|
|
1180
|
+
// 优先使用外部传入的 autoFillThirdPartyFields,未传时降级使用 record 中的 notAutoFillWithFirstSubmit
|
|
1181
|
+
var effectiveAutoFill = autoFillThirdPartyFields !== undefined ? autoFillThirdPartyFields : currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo25 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo25 === void 0 ? void 0 : _currentNodeDetail$wo25.notAutoFillWithFirstSubmit;
|
|
1182
|
+
if (effectiveAutoFill && autoSubmitFlag) {
|
|
1180
1183
|
autoSubmitFn();
|
|
1181
|
-
} else if (!
|
|
1184
|
+
} else if (!effectiveAutoFill && !autoSubmitFlag) {
|
|
1182
1185
|
autoSubmitFn();
|
|
1183
1186
|
}
|
|
1184
1187
|
}
|
|
1185
|
-
}, [currentNodeDetail, autoSubmitFlag]);
|
|
1188
|
+
}, [currentNodeDetail, autoSubmitFlag, autoFillThirdPartyFields]);
|
|
1186
1189
|
var isCurrentNodeHandler = useMemo(function () {
|
|
1187
|
-
var _currentNodeDetail$no17, _currentNodeDetail$no18, _currentNodeDetail$no19, _currentNodeDetail$no20, _currentNodeDetail$no21, _currentNodeDetail$no22, _currentNodeDetail$no23, _currentNodeDetail$no24, _currentNodeDetail$
|
|
1190
|
+
var _currentNodeDetail$no17, _currentNodeDetail$no18, _currentNodeDetail$no19, _currentNodeDetail$no20, _currentNodeDetail$no21, _currentNodeDetail$no22, _currentNodeDetail$no23, _currentNodeDetail$no24, _currentNodeDetail$wo26, _currentNodeDetail$no25, _currentNodeDetail$no26;
|
|
1188
1191
|
return currentUserHasOperatorAuth({
|
|
1189
1192
|
isSuperAdmin: isSuperAdmin,
|
|
1190
1193
|
assistantList: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no17 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no17 === void 0 ? void 0 : _currentNodeDetail$no17.id) && assistantMap[currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no18 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no18 === void 0 ? void 0 : _currentNodeDetail$no18.id] || [],
|
|
@@ -1192,7 +1195,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
1192
1195
|
currentUserKey: plat.userKey,
|
|
1193
1196
|
staffIds: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no21 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no21 === void 0 ? void 0 : (_currentNodeDetail$no22 = _currentNodeDetail$no21.assistants) === null || _currentNodeDetail$no22 === void 0 ? void 0 : _currentNodeDetail$no22.staffIds) || [],
|
|
1194
1197
|
operateDataPermission: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no23 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no23 === void 0 ? void 0 : (_currentNodeDetail$no24 = _currentNodeDetail$no23.assistants) === null || _currentNodeDetail$no24 === void 0 ? void 0 : _currentNodeDetail$no24.operateDataPermission,
|
|
1195
|
-
handlerList: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
1198
|
+
handlerList: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo26 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo26 === void 0 ? void 0 : _currentNodeDetail$wo26.handlerList) || [],
|
|
1196
1199
|
isAllStaff: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no25 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no25 === void 0 ? void 0 : (_currentNodeDetail$no26 = _currentNodeDetail$no25.assistants) === null || _currentNodeDetail$no26 === void 0 ? void 0 : _currentNodeDetail$no26.isAllStaff
|
|
1197
1200
|
});
|
|
1198
1201
|
}, [currentNodeDetail, plat, assistantMap, useGroupMap]);
|
|
@@ -1201,9 +1204,9 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
1201
1204
|
return item.accessToken === (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no27 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no27 === void 0 ? void 0 : (_currentNodeDetail$no28 = _currentNodeDetail$no27.relationEvent) === null || _currentNodeDetail$no28 === void 0 ? void 0 : _currentNodeDetail$no28.defaultShopUniqueKey);
|
|
1202
1205
|
})) === null || _shopList$find === void 0 ? void 0 : _shopList$find.shopId;
|
|
1203
1206
|
var ReportOrderRender = function ReportOrderRender(props) {
|
|
1204
|
-
var _currentNodeDetail$
|
|
1207
|
+
var _currentNodeDetail$wo27, _currentNodeDetail$wo28;
|
|
1205
1208
|
var details = props.details;
|
|
1206
|
-
var componentDtoList = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
1209
|
+
var componentDtoList = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo27 = currentNodeDetail.workOrderTemplateInfo) === null || _currentNodeDetail$wo27 === void 0 ? void 0 : _currentNodeDetail$wo27.componentDtoList.filter(function (t) {
|
|
1207
1210
|
return !CANNOT_BACK_FILL.includes(t.workOrderComponentType || '');
|
|
1208
1211
|
});
|
|
1209
1212
|
//获取可以返填的组件值
|
|
@@ -1211,7 +1214,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
1211
1214
|
_calcWorkOrderList2 = _slicedToArray(_calcWorkOrderList, 1),
|
|
1212
1215
|
transData = _calcWorkOrderList2[0];
|
|
1213
1216
|
//获取表单显示值
|
|
1214
|
-
var _calcWorkOrderList3 = calcWorkOrderList([details], currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
1217
|
+
var _calcWorkOrderList3 = calcWorkOrderList([details], currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo28 = currentNodeDetail.workOrderTemplateInfo) === null || _currentNodeDetail$wo28 === void 0 ? void 0 : _currentNodeDetail$wo28.componentDtoList),
|
|
1215
1218
|
_calcWorkOrderList4 = _slicedToArray(_calcWorkOrderList3, 1),
|
|
1216
1219
|
transDataall = _calcWorkOrderList4[0];
|
|
1217
1220
|
return /*#__PURE__*/React.createElement("div", {
|
|
@@ -1392,14 +1395,14 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
1392
1395
|
}, !follow ? '关注' : '已关注'), showImplementationEnter && /*#__PURE__*/React.createElement(Button, {
|
|
1393
1396
|
onClick: openFeedbackModal,
|
|
1394
1397
|
type: "link"
|
|
1395
|
-
}, "\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$
|
|
1398
|
+
}, "\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$wo29 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo29 === void 0 ? void 0 : _currentNodeDetail$wo29.buyerOpenUid)) && /*#__PURE__*/React.createElement(JumpBuyer, {
|
|
1396
1399
|
order_number: tid,
|
|
1397
1400
|
shop: (otherInfo === null || otherInfo === void 0 ? void 0 : otherInfo.taobaoNick) || '',
|
|
1398
|
-
buyer: (otherInfo === null || otherInfo === void 0 ? void 0 : otherInfo.buyerOpenUid) || (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
1401
|
+
buyer: (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),
|
|
1399
1402
|
platformType: otherInfo === null || otherInfo === void 0 ? void 0 : otherInfo.xzClientPlatformType
|
|
1400
|
-
})), /*#__PURE__*/React.createElement("div", null, (_JSON$parse = JSON.parse((currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
1403
|
+
})), /*#__PURE__*/React.createElement("div", null, (_JSON$parse = JSON.parse((currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo31 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo31 === void 0 ? void 0 : (_currentNodeDetail$wo32 = _currentNodeDetail$wo31.jsonMap) === null || _currentNodeDetail$wo32 === void 0 ? void 0 : _currentNodeDetail$wo32.flowTags) || '[]')) !== null && _JSON$parse !== void 0 && _JSON$parse.includes('AI_BUILD') ? /*#__PURE__*/React.createElement(Tag, {
|
|
1401
1404
|
color: "blue"
|
|
1402
|
-
}, "AI\u81EA\u52A8\u5EFA\u5355-".concat(WORK_ORDER_STATUS_AI_BUILD[currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
1405
|
+
}, "AI\u81EA\u52A8\u5EFA\u5355-".concat(WORK_ORDER_STATUS_AI_BUILD[currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo33 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo33 === void 0 ? void 0 : (_currentNodeDetail$wo34 = _currentNodeDetail$wo33.jsonMap) === null || _currentNodeDetail$wo34 === void 0 ? void 0 : _currentNodeDetail$wo34.flowStatus])) : null)), flowStatus && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Row, {
|
|
1403
1406
|
justify: 'space-between',
|
|
1404
1407
|
className: "header"
|
|
1405
1408
|
}, /*#__PURE__*/React.createElement(Col, null, /*#__PURE__*/React.createElement("div", {
|
|
@@ -1468,7 +1471,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
1468
1471
|
isSuperAdmin: isSuperAdmin
|
|
1469
1472
|
}));
|
|
1470
1473
|
}), currentNodeDetail && /*#__PURE__*/React.createElement(Timeline.Item, {
|
|
1471
|
-
key: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
1474
|
+
key: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo35 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo35 === void 0 ? void 0 : _currentNodeDetail$wo35.id) || 'current-node'
|
|
1472
1475
|
}, /*#__PURE__*/React.createElement(CurrentNode, {
|
|
1473
1476
|
ref: currentNodeRef,
|
|
1474
1477
|
flowTemplateId: flowTemplateId,
|
|
@@ -67,32 +67,8 @@ export declare const WORK_ORDER_STATUS_AI_BUILD: {
|
|
|
67
67
|
STOPPING: string;
|
|
68
68
|
COMPLETED: string;
|
|
69
69
|
};
|
|
70
|
-
export declare const SKIP_NODE_TYPES_CONFIG: {
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
JST_REISSUE_WORK_ORDER: {
|
|
76
|
-
name: string;
|
|
77
|
-
tips: string;
|
|
78
|
-
};
|
|
79
|
-
KM_ERP_REISSUE_WORK_ORDER: {
|
|
80
|
-
name: string;
|
|
81
|
-
tips: string;
|
|
82
|
-
};
|
|
83
|
-
KM_ERP_EXCHANGE_WORK_ORDER: {
|
|
84
|
-
name: string;
|
|
85
|
-
tips: string;
|
|
86
|
-
};
|
|
87
|
-
JKY_REISSUE_WORK_ORDER: {
|
|
88
|
-
name: string;
|
|
89
|
-
tips: string;
|
|
90
|
-
};
|
|
91
|
-
REISSUE_LOGISTICS_SYNC: boolean;
|
|
92
|
-
BS_E3_REISSUE_LOGISTICS_SYNC: boolean;
|
|
93
|
-
WDT_LOGISTICS_SYNC: boolean;
|
|
94
|
-
GY_REISSUE_LOGISTICS_SYNC: boolean;
|
|
95
|
-
KUAI_MAI_REISSUE_LOGISTICS_SYNC: boolean;
|
|
96
|
-
JST_REISSUE_LOGISTICS_SYNC: boolean;
|
|
97
|
-
JY_REISSUE_LOGISTICS_SYNC: boolean;
|
|
98
|
-
};
|
|
70
|
+
export declare const SKIP_NODE_TYPES_CONFIG: Record<string, boolean | {
|
|
71
|
+
name: string;
|
|
72
|
+
tips: string;
|
|
73
|
+
validateFn?: (params: any) => boolean;
|
|
74
|
+
}>;
|
|
@@ -90,32 +90,41 @@ export var WORK_ORDER_STATUS_AI_BUILD = (_WORK_ORDER_STATUS_AI = {}, _defineProp
|
|
|
90
90
|
|
|
91
91
|
//支持跳过的节点类型
|
|
92
92
|
export var SKIP_NODE_TYPES_CONFIG = {
|
|
93
|
-
|
|
93
|
+
GY_OBTAIN_REISSUE_OR_EXCHANGE_ORDER: {
|
|
94
94
|
name: '获取补发/换货单id(管易退货单接口补发/换货)',
|
|
95
95
|
tips: '补发单id/换货单id'
|
|
96
96
|
},
|
|
97
|
-
|
|
97
|
+
JST_REISSUE_WORK_ORDER: {
|
|
98
98
|
name: '补发(聚水潭)',
|
|
99
99
|
tips: '补发单id'
|
|
100
100
|
},
|
|
101
|
-
|
|
101
|
+
KM_ERP_REISSUE_WORK_ORDER: {
|
|
102
102
|
name: '补发(快麦ERP)',
|
|
103
103
|
tips: '补发单id'
|
|
104
104
|
},
|
|
105
|
-
|
|
105
|
+
KM_ERP_EXCHANGE_WORK_ORDER: {
|
|
106
106
|
name: '换货(快麦ERP)',
|
|
107
107
|
tips: '换货单id'
|
|
108
108
|
},
|
|
109
|
-
|
|
109
|
+
JKY_REISSUE_WORK_ORDER: {
|
|
110
110
|
name: '补发(聚客云)',
|
|
111
111
|
tips: '补发单id'
|
|
112
112
|
},
|
|
113
113
|
// 旺店通 系统订单号
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
114
|
+
REISSUE_LOGISTICS_SYNC: true,
|
|
115
|
+
BS_E3_REISSUE_LOGISTICS_SYNC: true,
|
|
116
|
+
WDT_LOGISTICS_SYNC: true,
|
|
117
|
+
GY_REISSUE_LOGISTICS_SYNC: true,
|
|
118
|
+
KUAI_MAI_REISSUE_LOGISTICS_SYNC: true,
|
|
119
|
+
JST_REISSUE_LOGISTICS_SYNC: true,
|
|
120
|
+
JY_REISSUE_LOGISTICS_SYNC: true,
|
|
121
|
+
WDT_RETURN_EXCHANGE_WORK_ORDER: {
|
|
122
|
+
name: '退换货(旺店通)',
|
|
123
|
+
tips: '系统订单号',
|
|
124
|
+
validateFn: function validateFn(nodeInfo) {
|
|
125
|
+
var _nodeInfo$relationEve;
|
|
126
|
+
//只有换货的时候支持跳过
|
|
127
|
+
return ((_nodeInfo$relationEve = nodeInfo.relationEvent) === null || _nodeInfo$relationEve === void 0 ? void 0 : _nodeInfo$relationEve.type) === 3;
|
|
128
|
+
}
|
|
129
|
+
}
|
|
121
130
|
};
|
|
@@ -478,6 +478,13 @@ export var SUBMIT_COMPONENT_SYSTEM_ORDER_MAP = {
|
|
|
478
478
|
ids: 'jkySystemSelectIds',
|
|
479
479
|
order: 'jkySystemShowOrder',
|
|
480
480
|
select: 'tradeNo'
|
|
481
|
+
},
|
|
482
|
+
PLATFORM_AFTER_SALES_ORDER: {
|
|
483
|
+
no: 'platformAfaterSalesOrderNo',
|
|
484
|
+
ids: 'platformAfaterSalesSelectIds',
|
|
485
|
+
order: 'platformAfaterSalesShowOrder',
|
|
486
|
+
select: 'platformAfaterSalesTradeNo',
|
|
487
|
+
shopId: 'platformAfaterSalesShopId'
|
|
481
488
|
}
|
|
482
489
|
};
|
|
483
490
|
export var platformMap = {
|
|
@@ -734,6 +734,9 @@ var handleSystemOrder = function handleSystemOrder(_ref51) {
|
|
|
734
734
|
select: (selectIds || []).includes(item === null || item === void 0 ? void 0 : item[SUBMIT_COMPONENT_SYSTEM_ORDER_MAP[type].select])
|
|
735
735
|
});
|
|
736
736
|
}));
|
|
737
|
+
if (SUBMIT_COMPONENT_SYSTEM_ORDER_MAP[type].shopId) {
|
|
738
|
+
addContent(SUBMIT_COMPONENT_SYSTEM_ORDER_MAP[type].shopId, getNowData("".concat(item.uniqueKey, ".shopId"), ''));
|
|
739
|
+
}
|
|
737
740
|
};
|
|
738
741
|
};
|
|
739
742
|
var handleBuyerMessageNotice = function handleBuyerMessageNotice(_ref52) {
|
|
@@ -1114,6 +1117,7 @@ var processComponent = function processComponent(_ref63) {
|
|
|
1114
1117
|
case 'JY_SYSTEM_ORDER':
|
|
1115
1118
|
case 'JKY_SYSTEM_ORDER':
|
|
1116
1119
|
case 'WDT_RETURN_BILL_NO':
|
|
1120
|
+
case 'PLATFORM_AFTER_SALES_ORDER':
|
|
1117
1121
|
wrapFn(handleSystemOrder);
|
|
1118
1122
|
break;
|
|
1119
1123
|
case 'BUYER_MESSAGE_NOTICE':
|
|
@@ -1127,6 +1131,7 @@ var processComponent = function processComponent(_ref63) {
|
|
|
1127
1131
|
break;
|
|
1128
1132
|
case 'REISSUE_TRADE_ID':
|
|
1129
1133
|
case 'EXCHANGE_TRADE_ID':
|
|
1134
|
+
case 'SWAP_OUT_TRADE_ID':
|
|
1130
1135
|
wrapFn(handleErpTradeId);
|
|
1131
1136
|
break;
|
|
1132
1137
|
case 'ERP_AFTER_SALE_TRADE_ID':
|
|
@@ -86,6 +86,7 @@ export declare const deleteCacheOrder: ({ templateList, values, nodeId, flowTemp
|
|
|
86
86
|
plat: any;
|
|
87
87
|
unDeleteOrderInfo: boolean;
|
|
88
88
|
}) => void;
|
|
89
|
+
export declare const afterSaleOrderBackValues: ({ templateList, value, form }: any) => void;
|
|
89
90
|
export declare const wdtReturnBillNoBackValues: ({ templateList, value, form }: any) => void;
|
|
90
91
|
export declare const bsSystemOrderBackValues: ({ templateList, value, form }: any) => void;
|
|
91
92
|
export declare const bsE3SystemOrderBackValues: ({ templateList, value, form }: any) => void;
|
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
|
|
2
|
-
function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
|
|
3
|
-
function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
4
|
-
function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
|
|
5
|
-
function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
|
|
6
2
|
function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
|
|
7
3
|
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
|
|
8
4
|
function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
9
|
-
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
|
|
10
|
-
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
|
|
11
5
|
function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
|
|
12
6
|
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
7
|
+
function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
|
|
8
|
+
function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
9
|
+
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
|
|
10
|
+
function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
|
|
11
|
+
function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
|
|
12
|
+
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
|
|
13
13
|
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
|
|
14
14
|
function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
|
|
15
15
|
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
@@ -19,9 +19,9 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
|
|
|
19
19
|
function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
|
|
20
20
|
import { message } from 'antd';
|
|
21
21
|
import { get, last, cloneDeep, isEqual, set } from 'lodash';
|
|
22
|
-
import { orderDetail, queryShopByTid } from "../../model/servers/api";
|
|
22
|
+
import { orderDetail, afterSaleOrderDetail, queryShopByTid } from "../../model/servers/api";
|
|
23
23
|
import moment from 'moment';
|
|
24
|
-
import { AddressData, ExpressData, ExpressInterceptData, orderBackFormValues, bsOrderBackFormValues, kmOrderBackFormValues, bsE3OrderBackFormValues, wlnOrderBackFormValues, wdtOrderBackFormValues, jstOrderBackFormValues, request, isNull, bsOrderTransform, bsE3OrderTransform, jstOrderTransform, filterJstOrders, wlnOrderTransform, wdtOrderTransform, kmOrderTransform, filterBsE3Orders, filterWdtOrders, filterKmOrders, unTransField, transMultSelectOptions, gyOrderBackFormValues, gyOrderTransform, filterGyOrders, filterJyOrders, setSessionStorage, jyOrderTransform, jyOrderBackFormValues, jkyOrderTransform, jkyOrderBackFormValues, skxOrderTransform, orderSubFormOrderTransform, skxReturnOrderTransform } from '@kmkf-fe-packages/kmkf-utils';
|
|
24
|
+
import { AddressData, ExpressData, ExpressInterceptData, orderBackFormValues, bsOrderBackFormValues, kmOrderBackFormValues, bsE3OrderBackFormValues, wlnOrderBackFormValues, platformAfterSalesOrderTransform, platformAfterSalesOrderBackFormValues, wdtOrderBackFormValues, jstOrderBackFormValues, request, isNull, bsOrderTransform, bsE3OrderTransform, jstOrderTransform, filterJstOrders, wlnOrderTransform, wdtOrderTransform, kmOrderTransform, filterBsE3Orders, filterWdtOrders, filterKmOrders, unTransField, transMultSelectOptions, gyOrderBackFormValues, gyOrderTransform, filterGyOrders, filterJyOrders, setSessionStorage, jyOrderTransform, jyOrderBackFormValues, jkyOrderTransform, jkyOrderBackFormValues, skxOrderTransform, orderSubFormOrderTransform, skxReturnOrderTransform } from '@kmkf-fe-packages/kmkf-utils';
|
|
25
25
|
import Monitor from 'kmkf-monitor';
|
|
26
26
|
import { PlatForm } from "../../model/flowTemplateDetail/types";
|
|
27
27
|
import transformWorkOrderData from "./transformWorkOrderData";
|
|
@@ -143,7 +143,7 @@ var getBasicsOrderInfo = function getBasicsOrderInfo(orderInfo, xiaozhiOrder) {
|
|
|
143
143
|
//订单返填
|
|
144
144
|
export var orderBack = /*#__PURE__*/function () {
|
|
145
145
|
var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
|
|
146
|
-
var companyKey, order_no, form, propsShopid, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, callbackShopId, setLoading, callKey, shopId, 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, _gyOrders$trades, _jyOrders$trades, _jkyOrders$trades, _kmOrders$orderDetail, promise, kmVideoComponent, OrderSubFormComponent, wdtReturnBillNoComponent, _yield$Promise$allSet, _yield$Promise$allSet2, data, 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, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, hasSigningDatetime, _signDatetime$data, signDatetime, values, paymentUniqueKey;
|
|
146
|
+
var companyKey, order_no, form, propsShopid, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, callbackShopId, setLoading, callKey, shopId, 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, _gyOrders$trades, _jyOrders$trades, _jkyOrders$trades, _kmOrders$orderDetail, _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, afterSaleOrderInfo, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, hasSigningDatetime, _signDatetime$data, signDatetime, values, paymentUniqueKey;
|
|
147
147
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
148
148
|
while (1) switch (_context.prev = _context.next) {
|
|
149
149
|
case 0:
|
|
@@ -243,6 +243,7 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
243
243
|
promise = [];
|
|
244
244
|
if (!JOIN_SHOP || thirdShopMainType === '1' && shopSourceStr === 'JD') {
|
|
245
245
|
promise.push(Promise.resolve([]));
|
|
246
|
+
promise.push(Promise.resolve([]));
|
|
246
247
|
} else {
|
|
247
248
|
promise.push(orderDetail({
|
|
248
249
|
shopId: shopId,
|
|
@@ -251,6 +252,17 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
251
252
|
//订单id
|
|
252
253
|
templateId: templateDetail.uniqueKey
|
|
253
254
|
}));
|
|
255
|
+
if ([].concat(_toConsumableArray(templateDetail.componentDtoList), _toConsumableArray(templateDetail.preNodeComponentDtoList)).find(function (item) {
|
|
256
|
+
return item.workOrderComponentType === 'PLATFORM_AFTER_SALES_ORDER';
|
|
257
|
+
})) {
|
|
258
|
+
promise.push(afterSaleOrderDetail({
|
|
259
|
+
shopId: shopId,
|
|
260
|
+
//店铺id
|
|
261
|
+
orderNo: order_no //订单id
|
|
262
|
+
}));
|
|
263
|
+
} else {
|
|
264
|
+
promise.push(Promise.resolve([]));
|
|
265
|
+
}
|
|
254
266
|
}
|
|
255
267
|
|
|
256
268
|
// 京东自营/pdd订单数据获取
|
|
@@ -313,23 +325,24 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
313
325
|
return Promise.allSettled(promise);
|
|
314
326
|
case 41:
|
|
315
327
|
_yield$Promise$allSet = _context.sent;
|
|
316
|
-
_yield$Promise$allSet2 = _slicedToArray(_yield$Promise$allSet,
|
|
328
|
+
_yield$Promise$allSet2 = _slicedToArray(_yield$Promise$allSet, 17);
|
|
317
329
|
data = _yield$Promise$allSet2[0];
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
330
|
+
afterSaleOrders = _yield$Promise$allSet2[1];
|
|
331
|
+
xiaozhiOrder = _yield$Promise$allSet2[2];
|
|
332
|
+
jstOrder = _yield$Promise$allSet2[3];
|
|
333
|
+
bsOrder = _yield$Promise$allSet2[4];
|
|
334
|
+
wlnOrder = _yield$Promise$allSet2[5];
|
|
335
|
+
wdtOrder = _yield$Promise$allSet2[6];
|
|
336
|
+
bsE3Order = _yield$Promise$allSet2[7];
|
|
337
|
+
kmOrder = _yield$Promise$allSet2[8];
|
|
338
|
+
gyOrder = _yield$Promise$allSet2[9];
|
|
339
|
+
jyOrder = _yield$Promise$allSet2[10];
|
|
340
|
+
skxOrder = _yield$Promise$allSet2[11];
|
|
341
|
+
skxReturnOrder = _yield$Promise$allSet2[12];
|
|
342
|
+
jkyOrder = _yield$Promise$allSet2[13];
|
|
343
|
+
kmVideoOrder = _yield$Promise$allSet2[14];
|
|
344
|
+
orderSubFormOrder = _yield$Promise$allSet2[15];
|
|
345
|
+
wdtReturnOrder = _yield$Promise$allSet2[16];
|
|
333
346
|
// TODO: 针对订单支付方式是微信还是支付宝,后端接口返回一个message用来提示使用
|
|
334
347
|
console.log('--订单反填数据--', {
|
|
335
348
|
data: data,
|
|
@@ -347,7 +360,8 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
347
360
|
jkyOrder: jkyOrder,
|
|
348
361
|
kmVideoOrder: kmVideoOrder,
|
|
349
362
|
orderSubFormOrder: orderSubFormOrder,
|
|
350
|
-
wdtReturnOrder: wdtReturnOrder
|
|
363
|
+
wdtReturnOrder: wdtReturnOrder,
|
|
364
|
+
afterSaleOrders: afterSaleOrders
|
|
351
365
|
});
|
|
352
366
|
pushGyLog('gyOrder', gyOrder);
|
|
353
367
|
if (data !== null && data !== void 0 && (_data$value = data.value) !== null && _data$value !== void 0 && _data$value.message) {
|
|
@@ -600,9 +614,18 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
600
614
|
// };
|
|
601
615
|
// skxReturnInfo.skxLogistics = [{ logisticsCompany: null, logisticsCode: '' }];
|
|
602
616
|
// }
|
|
603
|
-
|
|
604
|
-
//获取当前表单字段
|
|
605
617
|
formValue = form.getFieldsValue();
|
|
618
|
+
afterSalesOrderField = [].concat(_toConsumableArray(templateDetail.componentDtoList), _toConsumableArray(templateDetail.preNodeComponentDtoList)).find(function (item) {
|
|
619
|
+
return item.workOrderComponentType === 'PLATFORM_AFTER_SALES_ORDER';
|
|
620
|
+
});
|
|
621
|
+
value = (afterSalesOrderField === null || afterSalesOrderField === void 0 ? void 0 : afterSalesOrderField.uniqueKey) && formValue[afterSalesOrderField.uniqueKey];
|
|
622
|
+
afterSaleOrderInfo = platformAfterSalesOrderTransform({
|
|
623
|
+
orderNo: order_no,
|
|
624
|
+
shopId: shopId,
|
|
625
|
+
allOrders: (afterSaleOrders === null || afterSaleOrders === void 0 ? void 0 : (_afterSaleOrders$valu = afterSaleOrders.value) === null || _afterSaleOrders$valu === void 0 ? void 0 : _afterSaleOrders$valu.data) || [],
|
|
626
|
+
selectOrders: (value === null || value === void 0 ? void 0 : value.showOrderInfo) || []
|
|
627
|
+
}); // //获取当前表单字段
|
|
628
|
+
// const formValue = form.getFieldsValue();
|
|
606
629
|
detail = _objectSpread(_objectSpread({}, orderInfo || {}), {}, {
|
|
607
630
|
jstOrder: jstInfo,
|
|
608
631
|
bsOrder: bsInfo,
|
|
@@ -615,12 +638,13 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
615
638
|
skxOrder: skxInfo,
|
|
616
639
|
orderSubFormOrder: orderSubFormInfo,
|
|
617
640
|
skxReturnOrder: skxReturnInfo,
|
|
618
|
-
jkyOrder: jkyInfo
|
|
641
|
+
jkyOrder: jkyInfo,
|
|
642
|
+
afterSaleOrders: afterSaleOrderInfo
|
|
619
643
|
});
|
|
620
644
|
pushGyLog('detail', detail);
|
|
621
645
|
//抖音数据特殊处理
|
|
622
646
|
if (!orderInfo) {
|
|
623
|
-
_context.next =
|
|
647
|
+
_context.next = 154;
|
|
624
648
|
break;
|
|
625
649
|
}
|
|
626
650
|
if (shopSourceStr === 'FXG') {
|
|
@@ -632,7 +656,7 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
632
656
|
hasSelectItem = HasErpItemSelectHandle(templateDetail);
|
|
633
657
|
erpPromiseList = [];
|
|
634
658
|
if (!(shopSourceStr === 'TAOBAO' && hasSelectItem)) {
|
|
635
|
-
_context.next =
|
|
659
|
+
_context.next = 138;
|
|
636
660
|
break;
|
|
637
661
|
}
|
|
638
662
|
list = detail['itemList'];
|
|
@@ -650,10 +674,10 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
650
674
|
resolve({});
|
|
651
675
|
});
|
|
652
676
|
});
|
|
653
|
-
_context.prev =
|
|
654
|
-
_context.next =
|
|
677
|
+
_context.prev = 128;
|
|
678
|
+
_context.next = 131;
|
|
655
679
|
return Promise.all(promises);
|
|
656
|
-
case
|
|
680
|
+
case 131:
|
|
657
681
|
erpPromiseList = _context.sent;
|
|
658
682
|
detail['itemList'] = (_detail$itemList = detail['itemList']) === null || _detail$itemList === void 0 ? void 0 : _detail$itemList.map(function (item, index) {
|
|
659
683
|
return _objectSpread(_objectSpread({}, item), {}, {
|
|
@@ -663,25 +687,25 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
663
687
|
})
|
|
664
688
|
});
|
|
665
689
|
});
|
|
666
|
-
_context.next =
|
|
690
|
+
_context.next = 138;
|
|
667
691
|
break;
|
|
668
|
-
case
|
|
669
|
-
_context.prev =
|
|
670
|
-
_context.t1 = _context["catch"](
|
|
692
|
+
case 135:
|
|
693
|
+
_context.prev = 135;
|
|
694
|
+
_context.t1 = _context["catch"](128);
|
|
671
695
|
console.error('调用erp获取宝贝编码错误', _context.t1);
|
|
672
|
-
case
|
|
696
|
+
case 138:
|
|
673
697
|
// 判断是否存在签收时间组件
|
|
674
698
|
hasSigningDatetime = HasTradeSigningDatetime(templateDetail); // 如存在签收时间组件且订单也有返回相应物流单号跟物流公司编码,则调用接口获取签收时间
|
|
675
699
|
if (!hasSigningDatetime) {
|
|
676
|
-
_context.next =
|
|
700
|
+
_context.next = 154;
|
|
677
701
|
break;
|
|
678
702
|
}
|
|
679
703
|
if (!(orderInfo !== null && orderInfo !== void 0 && orderInfo.expressLogisticsCompany && orderInfo !== null && orderInfo !== void 0 && orderInfo.expressLogisticsCode)) {
|
|
680
|
-
_context.next =
|
|
704
|
+
_context.next = 153;
|
|
681
705
|
break;
|
|
682
706
|
}
|
|
683
|
-
_context.prev =
|
|
684
|
-
_context.next =
|
|
707
|
+
_context.prev = 141;
|
|
708
|
+
_context.next = 144;
|
|
685
709
|
return request({
|
|
686
710
|
url: '/qy/logistics/logisticsSignTime',
|
|
687
711
|
method: 'post',
|
|
@@ -691,22 +715,23 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
691
715
|
mailNo: orderInfo.expressLogisticsCode
|
|
692
716
|
}
|
|
693
717
|
});
|
|
694
|
-
case
|
|
718
|
+
case 144:
|
|
695
719
|
signDatetime = _context.sent;
|
|
696
720
|
detail['tradeSigningDateTime'] = signDatetime === null || signDatetime === void 0 ? void 0 : (_signDatetime$data = signDatetime.data) === null || _signDatetime$data === void 0 ? void 0 : _signDatetime$data.signTime;
|
|
697
|
-
_context.next =
|
|
721
|
+
_context.next = 151;
|
|
698
722
|
break;
|
|
699
|
-
case
|
|
700
|
-
_context.prev =
|
|
701
|
-
_context.t2 = _context["catch"](
|
|
723
|
+
case 148:
|
|
724
|
+
_context.prev = 148;
|
|
725
|
+
_context.t2 = _context["catch"](141);
|
|
702
726
|
console.error('调用签收时间错误', _context.t2);
|
|
703
|
-
case
|
|
704
|
-
_context.next =
|
|
727
|
+
case 151:
|
|
728
|
+
_context.next = 154;
|
|
705
729
|
break;
|
|
706
|
-
case
|
|
730
|
+
case 153:
|
|
707
731
|
detail['tradeSigningDateTime'] = '';
|
|
708
|
-
case
|
|
732
|
+
case 154:
|
|
709
733
|
values = orderBackFormValues({
|
|
734
|
+
shopId: shopId,
|
|
710
735
|
detail: detail,
|
|
711
736
|
_get_order_fail_: !orderInfo,
|
|
712
737
|
order_no: order_no,
|
|
@@ -758,21 +783,21 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
758
783
|
shopId: shopId
|
|
759
784
|
}));
|
|
760
785
|
callback === null || callback === void 0 ? void 0 : callback(detail, templateDetail);
|
|
761
|
-
_context.next =
|
|
786
|
+
_context.next = 166;
|
|
762
787
|
break;
|
|
763
|
-
case
|
|
764
|
-
_context.prev =
|
|
788
|
+
case 163:
|
|
789
|
+
_context.prev = 163;
|
|
765
790
|
_context.t3 = _context["catch"](27);
|
|
766
791
|
console.error(_context.t3);
|
|
767
|
-
case
|
|
768
|
-
_context.prev =
|
|
792
|
+
case 166:
|
|
793
|
+
_context.prev = 166;
|
|
769
794
|
setLoading === null || setLoading === void 0 ? void 0 : setLoading(false);
|
|
770
|
-
return _context.finish(
|
|
771
|
-
case
|
|
795
|
+
return _context.finish(166);
|
|
796
|
+
case 169:
|
|
772
797
|
case "end":
|
|
773
798
|
return _context.stop();
|
|
774
799
|
}
|
|
775
|
-
}, _callee, null, [[7, 14, 17, 20], [27,
|
|
800
|
+
}, _callee, null, [[7, 14, 17, 20], [27, 163, 166, 169], [128, 135], [141, 148]]);
|
|
776
801
|
}));
|
|
777
802
|
return function orderBack(_x) {
|
|
778
803
|
return _ref2.apply(this, arguments);
|
|
@@ -1127,6 +1152,7 @@ export var reversalFormValues = function reversalFormValues() {
|
|
|
1127
1152
|
prv["".concat(next.uniqueKey, "_returnGoodsTradeItemList")] = JSON.stringify(values[next.uniqueKey] || []);
|
|
1128
1153
|
break;
|
|
1129
1154
|
case 'REISSUE_TRADE_ID':
|
|
1155
|
+
case 'SWAP_OUT_TRADE_ID':
|
|
1130
1156
|
case 'EXCHANGE_TRADE_ID':
|
|
1131
1157
|
prv["".concat(next.uniqueKey, "_tradeItemList")] = JSON.stringify(values[next.uniqueKey] || []);
|
|
1132
1158
|
break;
|
|
@@ -1211,15 +1237,35 @@ export var deleteCacheOrder = function deleteCacheOrder(_ref6) {
|
|
|
1211
1237
|
}
|
|
1212
1238
|
}
|
|
1213
1239
|
};
|
|
1214
|
-
//
|
|
1215
|
-
export var
|
|
1240
|
+
// 平台时候单信息反填
|
|
1241
|
+
export var afterSaleOrderBackValues = function afterSaleOrderBackValues(_ref7) {
|
|
1216
1242
|
var _templateList$compone;
|
|
1217
1243
|
var templateList = _ref7.templateList,
|
|
1218
1244
|
value = _ref7.value,
|
|
1219
1245
|
form = _ref7.form;
|
|
1220
1246
|
//如果没有选择的值不返填,会有两种情况 1.有值为空 2.没有值 为空的时候需要返填
|
|
1221
1247
|
if (!(value !== null && value !== void 0 && value.selectedRows)) return;
|
|
1222
|
-
var
|
|
1248
|
+
var afterSaleComponent = (_templateList$compone = templateList.componentDtoList) === null || _templateList$compone === void 0 ? void 0 : _templateList$compone.filter(function (item) {
|
|
1249
|
+
return ['RETURN_LOGISTICS_SELECT', 'LOGISTICS_TRAJECTORY'].includes(item.workOrderComponentType);
|
|
1250
|
+
});
|
|
1251
|
+
if (!(afterSaleComponent !== null && afterSaleComponent !== void 0 && afterSaleComponent.length)) return;
|
|
1252
|
+
var orderInfo = platformAfterSalesOrderTransform({
|
|
1253
|
+
selectOrders: value.selectedRows
|
|
1254
|
+
});
|
|
1255
|
+
var values = platformAfterSalesOrderBackFormValues(orderInfo, {
|
|
1256
|
+
componentDtoList: afterSaleComponent
|
|
1257
|
+
});
|
|
1258
|
+
form.setFieldsValue(values);
|
|
1259
|
+
};
|
|
1260
|
+
//wdt售后商品信息返填
|
|
1261
|
+
export var wdtReturnBillNoBackValues = function wdtReturnBillNoBackValues(_ref8) {
|
|
1262
|
+
var _templateList$compone2;
|
|
1263
|
+
var templateList = _ref8.templateList,
|
|
1264
|
+
value = _ref8.value,
|
|
1265
|
+
form = _ref8.form;
|
|
1266
|
+
//如果没有选择的值不返填,会有两种情况 1.有值为空 2.没有值 为空的时候需要返填
|
|
1267
|
+
if (!(value !== null && value !== void 0 && value.selectedRows)) return;
|
|
1268
|
+
var wdtAftersaleGoodsComponent = (_templateList$compone2 = templateList.componentDtoList) === null || _templateList$compone2 === void 0 ? void 0 : _templateList$compone2.filter(function (item) {
|
|
1223
1269
|
return ['WDT_AFTERSALE_GOODS'].includes(item.workOrderComponentType);
|
|
1224
1270
|
});
|
|
1225
1271
|
if (!(wdtAftersaleGoodsComponent !== null && wdtAftersaleGoodsComponent !== void 0 && wdtAftersaleGoodsComponent.length)) return;
|
|
@@ -1236,14 +1282,14 @@ export var wdtReturnBillNoBackValues = function wdtReturnBillNoBackValues(_ref7)
|
|
|
1236
1282
|
form.setFieldsValue(values);
|
|
1237
1283
|
};
|
|
1238
1284
|
//bs商品信息返填
|
|
1239
|
-
export var bsSystemOrderBackValues = function bsSystemOrderBackValues(
|
|
1240
|
-
var _templateList$
|
|
1241
|
-
var templateList =
|
|
1242
|
-
value =
|
|
1243
|
-
form =
|
|
1285
|
+
export var bsSystemOrderBackValues = function bsSystemOrderBackValues(_ref9) {
|
|
1286
|
+
var _templateList$compone3;
|
|
1287
|
+
var templateList = _ref9.templateList,
|
|
1288
|
+
value = _ref9.value,
|
|
1289
|
+
form = _ref9.form;
|
|
1244
1290
|
//如果没有选择的值不返填,会有两种情况 1.有值为空 2.没有值 为空的时候需要返填
|
|
1245
1291
|
if (!(value !== null && value !== void 0 && value.selectedRows)) return;
|
|
1246
|
-
var bsGoodsComponent = (_templateList$
|
|
1292
|
+
var bsGoodsComponent = (_templateList$compone3 = templateList.componentDtoList) === null || _templateList$compone3 === void 0 ? void 0 : _templateList$compone3.filter(function (item) {
|
|
1247
1293
|
return ['BS_GOODS', 'BS_DELIVERY_NO', 'BS_SEND_GOOD', 'BS_LOGISTICS', 'BS_REISSUE_GOODS', 'BS_RETURN_GOODS', 'BS_EXCHANGE_GOODS', 'LOGISTICS_TRAJECTORY_MORE', 'LOGISTICS_INTERCEPTION_MORE'].includes(item.workOrderComponentType);
|
|
1248
1294
|
});
|
|
1249
1295
|
if (!(bsGoodsComponent !== null && bsGoodsComponent !== void 0 && bsGoodsComponent.length)) return;
|
|
@@ -1260,18 +1306,18 @@ export var bsSystemOrderBackValues = function bsSystemOrderBackValues(_ref8) {
|
|
|
1260
1306
|
form.setFieldsValue(values);
|
|
1261
1307
|
};
|
|
1262
1308
|
// bs e3商品信息返填
|
|
1263
|
-
export var bsE3SystemOrderBackValues = function bsE3SystemOrderBackValues(
|
|
1264
|
-
var _templateList$
|
|
1265
|
-
var templateList =
|
|
1266
|
-
value =
|
|
1267
|
-
form =
|
|
1309
|
+
export var bsE3SystemOrderBackValues = function bsE3SystemOrderBackValues(_ref10) {
|
|
1310
|
+
var _templateList$compone4, _templateList$compone5;
|
|
1311
|
+
var templateList = _ref10.templateList,
|
|
1312
|
+
value = _ref10.value,
|
|
1313
|
+
form = _ref10.form;
|
|
1268
1314
|
//如果没有选择的值不返填,会有两种情况 1.有值为空 2.没有值 为空的时候需要返填
|
|
1269
1315
|
if (!(value !== null && value !== void 0 && value.selectedRows)) return;
|
|
1270
|
-
var bsE3GoodsComponent = (_templateList$
|
|
1316
|
+
var bsE3GoodsComponent = (_templateList$compone4 = templateList.componentDtoList) === null || _templateList$compone4 === void 0 ? void 0 : _templateList$compone4.filter(function (item) {
|
|
1271
1317
|
return ['BS_E3_GOODS', 'BS_E3_SEND_GOOD', 'BS_E3_LOGISTICS'].includes(item.workOrderComponentType) && !item.notOrderBack;
|
|
1272
1318
|
});
|
|
1273
1319
|
if (!(bsE3GoodsComponent !== null && bsE3GoodsComponent !== void 0 && bsE3GoodsComponent.length)) return;
|
|
1274
|
-
var tIdCom = (_templateList$
|
|
1320
|
+
var tIdCom = (_templateList$compone5 = templateList.componentDtoList) === null || _templateList$compone5 === void 0 ? void 0 : _templateList$compone5.find(function (item) {
|
|
1275
1321
|
return item.workOrderComponentType === 'TRADE_ID_INPUT';
|
|
1276
1322
|
});
|
|
1277
1323
|
var orderNo = tIdCom !== null && tIdCom !== void 0 && tIdCom.uniqueKey ? form.getFieldValue(tIdCom.uniqueKey) : null;
|
|
@@ -1288,14 +1334,14 @@ export var bsE3SystemOrderBackValues = function bsE3SystemOrderBackValues(_ref9)
|
|
|
1288
1334
|
};
|
|
1289
1335
|
|
|
1290
1336
|
//wln商品信息返填
|
|
1291
|
-
export var wlnSystemOrderBackValues = function wlnSystemOrderBackValues(
|
|
1292
|
-
var _templateList$
|
|
1293
|
-
var templateList =
|
|
1294
|
-
value =
|
|
1295
|
-
form =
|
|
1337
|
+
export var wlnSystemOrderBackValues = function wlnSystemOrderBackValues(_ref11) {
|
|
1338
|
+
var _templateList$compone6;
|
|
1339
|
+
var templateList = _ref11.templateList,
|
|
1340
|
+
value = _ref11.value,
|
|
1341
|
+
form = _ref11.form;
|
|
1296
1342
|
//如果没有选择的值不返填,会有两种情况 1.有值为空 2.没有值 为空的时候需要返填
|
|
1297
1343
|
if (!(value !== null && value !== void 0 && value.selectedRows)) return;
|
|
1298
|
-
var bsGoodsComponent = (_templateList$
|
|
1344
|
+
var bsGoodsComponent = (_templateList$compone6 = templateList.componentDtoList) === null || _templateList$compone6 === void 0 ? void 0 : _templateList$compone6.filter(function (item) {
|
|
1299
1345
|
return ['WLN_GOODS', 'WLN_SEND_GOOD', 'WLN_LOGISTICS'].includes(item.workOrderComponentType);
|
|
1300
1346
|
});
|
|
1301
1347
|
if (!(bsGoodsComponent !== null && bsGoodsComponent !== void 0 && bsGoodsComponent.length)) return;
|
|
@@ -1312,18 +1358,18 @@ export var wlnSystemOrderBackValues = function wlnSystemOrderBackValues(_ref10)
|
|
|
1312
1358
|
};
|
|
1313
1359
|
|
|
1314
1360
|
// km 商品信息返填
|
|
1315
|
-
export var kmSystemOrderBackValues = function kmSystemOrderBackValues(
|
|
1316
|
-
var _templateList$
|
|
1317
|
-
var templateList =
|
|
1318
|
-
value =
|
|
1319
|
-
form =
|
|
1361
|
+
export var kmSystemOrderBackValues = function kmSystemOrderBackValues(_ref12) {
|
|
1362
|
+
var _templateList$compone7, _templateList$compone8;
|
|
1363
|
+
var templateList = _ref12.templateList,
|
|
1364
|
+
value = _ref12.value,
|
|
1365
|
+
form = _ref12.form;
|
|
1320
1366
|
//如果没有选择的值不返填,会有两种情况 1.有值为空 2.没有值 为空的时候需要返填
|
|
1321
1367
|
if (!(value !== null && value !== void 0 && value.selectedRows)) return;
|
|
1322
|
-
var kmGoodsComponent = (_templateList$
|
|
1368
|
+
var kmGoodsComponent = (_templateList$compone7 = templateList.componentDtoList) === null || _templateList$compone7 === void 0 ? void 0 : _templateList$compone7.filter(function (item) {
|
|
1323
1369
|
return ['KM_GOODS', 'KM_SEND_GOOD', 'KM_LOGISTICS'].includes(item.workOrderComponentType) && !item.notOrderBack;
|
|
1324
1370
|
});
|
|
1325
1371
|
if (!(kmGoodsComponent !== null && kmGoodsComponent !== void 0 && kmGoodsComponent.length)) return;
|
|
1326
|
-
var tIdCom = (_templateList$
|
|
1372
|
+
var tIdCom = (_templateList$compone8 = templateList.componentDtoList) === null || _templateList$compone8 === void 0 ? void 0 : _templateList$compone8.find(function (item) {
|
|
1327
1373
|
return item.workOrderComponentType === 'TRADE_ID_INPUT';
|
|
1328
1374
|
});
|
|
1329
1375
|
var orderNo = tIdCom !== null && tIdCom !== void 0 && tIdCom.uniqueKey ? form.getFieldValue(tIdCom.uniqueKey) : null;
|
|
@@ -1340,18 +1386,18 @@ export var kmSystemOrderBackValues = function kmSystemOrderBackValues(_ref11) {
|
|
|
1340
1386
|
};
|
|
1341
1387
|
|
|
1342
1388
|
// wdt商品信息返填
|
|
1343
|
-
export var wdtSystemOrderBackValues = function wdtSystemOrderBackValues(
|
|
1344
|
-
var _templateList$
|
|
1345
|
-
var templateList =
|
|
1346
|
-
value =
|
|
1347
|
-
form =
|
|
1389
|
+
export var wdtSystemOrderBackValues = function wdtSystemOrderBackValues(_ref13) {
|
|
1390
|
+
var _templateList$compone9, _templateList$compone10;
|
|
1391
|
+
var templateList = _ref13.templateList,
|
|
1392
|
+
value = _ref13.value,
|
|
1393
|
+
form = _ref13.form;
|
|
1348
1394
|
//如果没有选择的值不返填,会有两种情况 1.有值为空 2.没有值 为空的时候需要返填
|
|
1349
1395
|
if (!(value !== null && value !== void 0 && value.selectedRows)) return;
|
|
1350
|
-
var wdtGoodsComponent = (_templateList$
|
|
1396
|
+
var wdtGoodsComponent = (_templateList$compone9 = templateList.componentDtoList) === null || _templateList$compone9 === void 0 ? void 0 : _templateList$compone9.filter(function (item) {
|
|
1351
1397
|
return ['WDT_GOODS', 'WDT_DELIVERY_NO', 'WDT_SEND_GOOD', 'WDT_LOGISTICS'].includes(item.workOrderComponentType) && !item.notOrderBack;
|
|
1352
1398
|
});
|
|
1353
1399
|
if (!(wdtGoodsComponent !== null && wdtGoodsComponent !== void 0 && wdtGoodsComponent.length)) return;
|
|
1354
|
-
var tIdCom = (_templateList$
|
|
1400
|
+
var tIdCom = (_templateList$compone10 = templateList.componentDtoList) === null || _templateList$compone10 === void 0 ? void 0 : _templateList$compone10.find(function (item) {
|
|
1355
1401
|
return item.workOrderComponentType === 'TRADE_ID_INPUT';
|
|
1356
1402
|
});
|
|
1357
1403
|
var orderNo = tIdCom !== null && tIdCom !== void 0 && tIdCom.uniqueKey ? form.getFieldValue(tIdCom.uniqueKey) : null;
|
|
@@ -1373,18 +1419,18 @@ export var wdtSystemOrderBackValues = function wdtSystemOrderBackValues(_ref12)
|
|
|
1373
1419
|
};
|
|
1374
1420
|
|
|
1375
1421
|
//gy商品信息返填
|
|
1376
|
-
export var gySystemOrderBackValues = function gySystemOrderBackValues(
|
|
1377
|
-
var _templateList$
|
|
1378
|
-
var templateList =
|
|
1379
|
-
value =
|
|
1380
|
-
form =
|
|
1422
|
+
export var gySystemOrderBackValues = function gySystemOrderBackValues(_ref14) {
|
|
1423
|
+
var _templateList$compone11, _templateList$compone12;
|
|
1424
|
+
var templateList = _ref14.templateList,
|
|
1425
|
+
value = _ref14.value,
|
|
1426
|
+
form = _ref14.form;
|
|
1381
1427
|
//如果没有选择的值不返填,会有两种情况 1.有值为空 2.没有值 为空的时候需要返填
|
|
1382
1428
|
if (!(value !== null && value !== void 0 && value.selectedRows)) return;
|
|
1383
|
-
var gyGoodsComponent = (_templateList$
|
|
1429
|
+
var gyGoodsComponent = (_templateList$compone11 = templateList.componentDtoList) === null || _templateList$compone11 === void 0 ? void 0 : _templateList$compone11.filter(function (item) {
|
|
1384
1430
|
return ['GY_GOODS', 'GY_SEND_GOOD', 'GY_LOGISTICS'].includes(item.workOrderComponentType) && !item.notOrderBack;
|
|
1385
1431
|
});
|
|
1386
1432
|
if (!(gyGoodsComponent !== null && gyGoodsComponent !== void 0 && gyGoodsComponent.length)) return;
|
|
1387
|
-
var tIdCom = (_templateList$
|
|
1433
|
+
var tIdCom = (_templateList$compone12 = templateList.componentDtoList) === null || _templateList$compone12 === void 0 ? void 0 : _templateList$compone12.find(function (item) {
|
|
1388
1434
|
return item.workOrderComponentType === 'TRADE_ID_INPUT';
|
|
1389
1435
|
});
|
|
1390
1436
|
var orderNo = tIdCom !== null && tIdCom !== void 0 && tIdCom.uniqueKey ? form.getFieldValue(tIdCom.uniqueKey) : null;
|
|
@@ -1401,18 +1447,18 @@ export var gySystemOrderBackValues = function gySystemOrderBackValues(_ref13) {
|
|
|
1401
1447
|
};
|
|
1402
1448
|
|
|
1403
1449
|
//聚水潭商品信息返填
|
|
1404
|
-
export var jstSystemOrderBackValues = function jstSystemOrderBackValues(
|
|
1405
|
-
var _templateList$
|
|
1406
|
-
var templateList =
|
|
1407
|
-
value =
|
|
1408
|
-
form =
|
|
1450
|
+
export var jstSystemOrderBackValues = function jstSystemOrderBackValues(_ref15) {
|
|
1451
|
+
var _templateList$compone13, _templateList$compone14;
|
|
1452
|
+
var templateList = _ref15.templateList,
|
|
1453
|
+
value = _ref15.value,
|
|
1454
|
+
form = _ref15.form;
|
|
1409
1455
|
//如果没有选择的值不返填,会有两种情况 1.有值为空 2.没有值 为空的时候需要返填
|
|
1410
1456
|
if (!(value !== null && value !== void 0 && value.selectedRows)) return;
|
|
1411
|
-
var jstGoodsComponent = (_templateList$
|
|
1457
|
+
var jstGoodsComponent = (_templateList$compone13 = templateList.componentDtoList) === null || _templateList$compone13 === void 0 ? void 0 : _templateList$compone13.filter(function (item) {
|
|
1412
1458
|
return ['JST_GOODS', 'JST_SEND_GOOD', 'JST_LOGISTICS', 'JST_SUPPLY', 'JST_ITEM_SELECT_THIRD'].includes(item.workOrderComponentType) && !item.notOrderBack;
|
|
1413
1459
|
});
|
|
1414
1460
|
if (!(jstGoodsComponent !== null && jstGoodsComponent !== void 0 && jstGoodsComponent.length)) return;
|
|
1415
|
-
var tIdCom = (_templateList$
|
|
1461
|
+
var tIdCom = (_templateList$compone14 = templateList.componentDtoList) === null || _templateList$compone14 === void 0 ? void 0 : _templateList$compone14.find(function (item) {
|
|
1416
1462
|
return item.workOrderComponentType === 'TRADE_ID_INPUT';
|
|
1417
1463
|
});
|
|
1418
1464
|
var orderNo = tIdCom !== null && tIdCom !== void 0 && tIdCom.uniqueKey ? form.getFieldValue(tIdCom.uniqueKey) : null;
|
|
@@ -1428,18 +1474,18 @@ export var jstSystemOrderBackValues = function jstSystemOrderBackValues(_ref14)
|
|
|
1428
1474
|
form.setFieldsValue(values);
|
|
1429
1475
|
};
|
|
1430
1476
|
// 巨益商品信息反填
|
|
1431
|
-
export var jySystemOrderBackValues = function jySystemOrderBackValues(
|
|
1432
|
-
var _templateList$
|
|
1433
|
-
var templateList =
|
|
1434
|
-
value =
|
|
1435
|
-
form =
|
|
1477
|
+
export var jySystemOrderBackValues = function jySystemOrderBackValues(_ref16) {
|
|
1478
|
+
var _templateList$compone15, _templateList$compone16;
|
|
1479
|
+
var templateList = _ref16.templateList,
|
|
1480
|
+
value = _ref16.value,
|
|
1481
|
+
form = _ref16.form;
|
|
1436
1482
|
//如果没有选择的值不返填,会有两种情况 1.有值为空 2.没有值 为空的时候需要返填
|
|
1437
1483
|
if (!(value !== null && value !== void 0 && value.selectedRows)) return;
|
|
1438
|
-
var jyGoodsComponent = (_templateList$
|
|
1484
|
+
var jyGoodsComponent = (_templateList$compone15 = templateList.componentDtoList) === null || _templateList$compone15 === void 0 ? void 0 : _templateList$compone15.filter(function (item) {
|
|
1439
1485
|
return ['JY_GOODS', 'JY_SEND_GOOD', 'JY_LOGISTICS'].includes(item.workOrderComponentType) && !item.notOrderBack;
|
|
1440
1486
|
});
|
|
1441
1487
|
if (!(jyGoodsComponent !== null && jyGoodsComponent !== void 0 && jyGoodsComponent.length)) return;
|
|
1442
|
-
var tIdCom = (_templateList$
|
|
1488
|
+
var tIdCom = (_templateList$compone16 = templateList.componentDtoList) === null || _templateList$compone16 === void 0 ? void 0 : _templateList$compone16.find(function (item) {
|
|
1443
1489
|
return item.workOrderComponentType === 'TRADE_ID_INPUT';
|
|
1444
1490
|
});
|
|
1445
1491
|
var orderNo = tIdCom !== null && tIdCom !== void 0 && tIdCom.uniqueKey ? form.getFieldValue(tIdCom.uniqueKey) : null;
|
|
@@ -1455,18 +1501,18 @@ export var jySystemOrderBackValues = function jySystemOrderBackValues(_ref15) {
|
|
|
1455
1501
|
form.setFieldsValue(values);
|
|
1456
1502
|
};
|
|
1457
1503
|
// 吉客云商票信息反填
|
|
1458
|
-
export var jkySystemOrderBackValues = function jkySystemOrderBackValues(
|
|
1459
|
-
var _templateList$
|
|
1460
|
-
var templateList =
|
|
1461
|
-
value =
|
|
1462
|
-
form =
|
|
1504
|
+
export var jkySystemOrderBackValues = function jkySystemOrderBackValues(_ref17) {
|
|
1505
|
+
var _templateList$compone17, _templateList$compone18;
|
|
1506
|
+
var templateList = _ref17.templateList,
|
|
1507
|
+
value = _ref17.value,
|
|
1508
|
+
form = _ref17.form;
|
|
1463
1509
|
//如果没有选择的值不返填,会有两种情况 1.有值为空 2.没有值 为空的时候需要返填
|
|
1464
1510
|
if (!(value !== null && value !== void 0 && value.selectedRows)) return;
|
|
1465
|
-
var jkyGoodsComponent = (_templateList$
|
|
1511
|
+
var jkyGoodsComponent = (_templateList$compone17 = templateList.componentDtoList) === null || _templateList$compone17 === void 0 ? void 0 : _templateList$compone17.filter(function (item) {
|
|
1466
1512
|
return ['JKY_GOODS', 'JKY_SEND_GOOD', 'JKY_LOGISTICS'].includes(item.workOrderComponentType) && !item.notOrderBack;
|
|
1467
1513
|
});
|
|
1468
1514
|
if (!(jkyGoodsComponent !== null && jkyGoodsComponent !== void 0 && jkyGoodsComponent.length)) return;
|
|
1469
|
-
var tIdCom = (_templateList$
|
|
1515
|
+
var tIdCom = (_templateList$compone18 = templateList.componentDtoList) === null || _templateList$compone18 === void 0 ? void 0 : _templateList$compone18.find(function (item) {
|
|
1470
1516
|
return item.workOrderComponentType === 'TRADE_ID_INPUT';
|
|
1471
1517
|
});
|
|
1472
1518
|
var orderNo = tIdCom !== null && tIdCom !== void 0 && tIdCom.uniqueKey ? form.getFieldValue(tIdCom.uniqueKey) : null;
|
|
@@ -1641,12 +1687,12 @@ export var transformWorkOrderDetail = function transformWorkOrderDetail(detail)
|
|
|
1641
1687
|
};
|
|
1642
1688
|
|
|
1643
1689
|
// 返填物流轨迹信息
|
|
1644
|
-
export var setLogisticsInfo = function setLogisticsInfo(
|
|
1645
|
-
var logisticsMappingConfig =
|
|
1646
|
-
uniqueKey =
|
|
1647
|
-
workOrderComponentType =
|
|
1648
|
-
value =
|
|
1649
|
-
form =
|
|
1690
|
+
export var setLogisticsInfo = function setLogisticsInfo(_ref18) {
|
|
1691
|
+
var logisticsMappingConfig = _ref18.logisticsMappingConfig,
|
|
1692
|
+
uniqueKey = _ref18.uniqueKey,
|
|
1693
|
+
workOrderComponentType = _ref18.workOrderComponentType,
|
|
1694
|
+
value = _ref18.value,
|
|
1695
|
+
form = _ref18.form;
|
|
1650
1696
|
var values = logisticsMappingConfig.reduce(function (prv, next) {
|
|
1651
1697
|
var logisticsValues = form.getFieldValue(next.uniqueKey);
|
|
1652
1698
|
var componentConfig = next.componentConfig;
|
|
@@ -1773,13 +1819,13 @@ export var getHashParams = function getHashParams() {
|
|
|
1773
1819
|
/**
|
|
1774
1820
|
* 修改部分组件小写改成大写
|
|
1775
1821
|
*/
|
|
1776
|
-
export var updateComponentToUpperCase = function updateComponentToUpperCase(
|
|
1777
|
-
var
|
|
1778
|
-
componentDtoList =
|
|
1779
|
-
|
|
1780
|
-
allValues =
|
|
1781
|
-
uniqueKey =
|
|
1782
|
-
form =
|
|
1822
|
+
export var updateComponentToUpperCase = function updateComponentToUpperCase(_ref19) {
|
|
1823
|
+
var _ref19$componentDtoLi = _ref19.componentDtoList,
|
|
1824
|
+
componentDtoList = _ref19$componentDtoLi === void 0 ? [] : _ref19$componentDtoLi,
|
|
1825
|
+
_ref19$allValues = _ref19.allValues,
|
|
1826
|
+
allValues = _ref19$allValues === void 0 ? {} : _ref19$allValues,
|
|
1827
|
+
uniqueKey = _ref19.uniqueKey,
|
|
1828
|
+
form = _ref19.form;
|
|
1783
1829
|
//固定组件自动转换
|
|
1784
1830
|
var FIXED_COMPONENTS = ['SKX_OUTBOUND_NOTICE_NO', 'SKX_LOGISTICS', 'SKX_RETURN_BILL_NO', 'SKX_RETURN_LOGISTICS'];
|
|
1785
1831
|
var updateComponent = componentDtoList.filter(function (item) {
|
|
@@ -926,6 +926,12 @@ var processBsReturnGoods = function processBsReturnGoods(getValue) {
|
|
|
926
926
|
var processErpSystemOrder = function processErpSystemOrder(getValue) {
|
|
927
927
|
return function (nex, config) {
|
|
928
928
|
var systemOrderMap = {
|
|
929
|
+
PLATFORM_AFTER_SALES_ORDER: {
|
|
930
|
+
no: 'platformAfaterSalesOrderNo',
|
|
931
|
+
ids: 'platformAfaterSalesSelectIds',
|
|
932
|
+
order: 'platformAfaterSalesShowOrder',
|
|
933
|
+
shopId: 'platformAfaterSalesShopId'
|
|
934
|
+
},
|
|
929
935
|
BS_SYSTEM_ORDER: {
|
|
930
936
|
no: 'bsSystemOrderNo',
|
|
931
937
|
ids: 'bsSystemSelectIds',
|
|
@@ -977,12 +983,14 @@ var processErpSystemOrder = function processErpSystemOrder(getValue) {
|
|
|
977
983
|
order: 'wdtReturnBillShowOrder'
|
|
978
984
|
}
|
|
979
985
|
};
|
|
980
|
-
return _defineProperty({}, nex.uniqueKey, {
|
|
986
|
+
return _defineProperty({}, nex.uniqueKey, _objectSpread({
|
|
981
987
|
orderNo: getValue("".concat(nex.uniqueKey, "_").concat(systemOrderMap[nex.workOrderComponentType].no)),
|
|
982
988
|
orders: nex.workOrderComponentType === 'WDT_RETURN_BILL_NO' ? jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_").concat(systemOrderMap[nex.workOrderComponentType].order)), []) : [],
|
|
983
989
|
selectIds: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_").concat(systemOrderMap[nex.workOrderComponentType].ids)), []),
|
|
984
990
|
showOrderInfo: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_").concat(systemOrderMap[nex.workOrderComponentType].order)), [])
|
|
985
|
-
}
|
|
991
|
+
}, systemOrderMap[nex.workOrderComponentType].shopId ? {
|
|
992
|
+
shopId: getValue("".concat(nex.uniqueKey, "_").concat(systemOrderMap[nex.workOrderComponentType].shopId))
|
|
993
|
+
} : {}));
|
|
986
994
|
};
|
|
987
995
|
};
|
|
988
996
|
var processBuyerMessageNotice = function processBuyerMessageNotice(getValue) {
|
|
@@ -1040,6 +1048,10 @@ var processErpTradeId = function processErpTradeId(getValue) {
|
|
|
1040
1048
|
EXCHANGE_TRADE_ID: {
|
|
1041
1049
|
key: 'tradeItemList',
|
|
1042
1050
|
defaultValue: []
|
|
1051
|
+
},
|
|
1052
|
+
SWAP_OUT_TRADE_ID: {
|
|
1053
|
+
key: 'tradeItemList',
|
|
1054
|
+
defaultValue: []
|
|
1043
1055
|
}
|
|
1044
1056
|
};
|
|
1045
1057
|
return _defineProperty({}, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_").concat(SYSTEM_ORDER_MAP[nex.workOrderComponentType].key)), SYSTEM_ORDER_MAP[nex.workOrderComponentType].defaultValue));
|
|
@@ -1462,6 +1474,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
|
|
|
1462
1474
|
RETURN_GOODS_TRADE_ID: processErpTradeId,
|
|
1463
1475
|
BS_DELIVERY_NO: processErpTradeId,
|
|
1464
1476
|
REISSUE_TRADE_ID: processErpTradeId,
|
|
1477
|
+
SWAP_OUT_TRADE_ID: processErpTradeId,
|
|
1465
1478
|
ERP_AFTER_SALE_TRADE_ID: processErpTradeId,
|
|
1466
1479
|
EXCHANGE_TRADE_ID: processErpTradeId,
|
|
1467
1480
|
WLN_GOODS: processWlnGoods(templateColumns),
|
|
@@ -33,6 +33,10 @@ export declare const addWorkOrder: (data: any) => Promise<any>;
|
|
|
33
33
|
export declare const queryWorkOrderDetail: (data: any) => Promise<any>;
|
|
34
34
|
export declare const updateWorkOrder: (data: any) => Promise<any>;
|
|
35
35
|
export declare const orderDetail: (data: any, infoLevel?: 'error' | 'warning' | 'quiet') => Promise<any>;
|
|
36
|
+
export declare const afterSaleOrderDetail: (data: {
|
|
37
|
+
shopId: string;
|
|
38
|
+
orderNo: string;
|
|
39
|
+
}, infoLevel?: 'error' | 'warning' | 'quiet') => Promise<any>;
|
|
36
40
|
export declare const decodeAlipayInfo: (data: any) => Promise<any>;
|
|
37
41
|
export declare const queryPaymentWorkOrderList: (data: any) => Promise<any>;
|
|
38
42
|
export declare const examinePaymentOrder: (data: any) => Promise<any>;
|
|
@@ -140,6 +140,16 @@ export var orderDetail = function orderDetail(data) {
|
|
|
140
140
|
infoLevel: infoLevel
|
|
141
141
|
});
|
|
142
142
|
};
|
|
143
|
+
export var afterSaleOrderDetail = function afterSaleOrderDetail(data) {
|
|
144
|
+
var infoLevel = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'warning';
|
|
145
|
+
return request({
|
|
146
|
+
url: '/qy/gdfw/order/queryTradeAfterSaleList',
|
|
147
|
+
method: 'post',
|
|
148
|
+
data: data,
|
|
149
|
+
infoLevel: infoLevel
|
|
150
|
+
});
|
|
151
|
+
};
|
|
152
|
+
|
|
143
153
|
//支付信息解密
|
|
144
154
|
export var decodeAlipayInfo = function decodeAlipayInfo(data) {
|
|
145
155
|
return request({
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kmkf-fe-packages/kmkf-work-order-service-component",
|
|
3
|
-
"version": "2.6.1-beta.
|
|
3
|
+
"version": "2.6.1-beta.3",
|
|
4
4
|
"module": "dist/esm/index.js",
|
|
5
5
|
"typings": "dist/esm/index.d.ts",
|
|
6
6
|
"files": [
|
|
@@ -34,7 +34,7 @@
|
|
|
34
34
|
"@ant-design/icons": "^4.7.0",
|
|
35
35
|
"@kmkf-fe-packages/basic-components": "2.6.0",
|
|
36
36
|
"@kmkf-fe-packages/kmkf-utils": "2.6.0",
|
|
37
|
-
"@kmkf-fe-packages/services-components": "2.6.1-beta.
|
|
37
|
+
"@kmkf-fe-packages/services-components": "2.6.1-beta.3",
|
|
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": "b8278a54ccc947841ab3621a391ab8bdd289c411",
|
|
79
79
|
"gitHooks": {
|
|
80
80
|
"pre-commit": "lint-staged"
|
|
81
81
|
}
|