@kmkf-fe-packages/kmkf-work-order-service-component 2.8.1 → 2.8.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.js +121 -24
- package/dist/esm/FlowTemplateDetailV2/components/CurrentNode/index.module.less +9 -0
- package/dist/esm/FlowTemplateDetailV2/constant.js +1 -1
- package/dist/esm/KmErpTradeList/components/SystemOrderCard.js +5 -1
- package/dist/esm/WorkOrder/components/WorkOrderList/index.js +5 -1
- package/dist/esm/common/constant.js +12 -0
- package/dist/esm/common/utils/constant.js +14 -0
- package/dist/esm/common/utils/submitDataTransOldFormat.js +4 -1
- package/dist/esm/common/utils/tools.js +14 -8
- package/dist/esm/common/utils/tools_constants.js +21 -6
- package/dist/esm/common/utils/transformWorkOrderData.js +35 -5
- package/package.json +5 -5
|
@@ -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', 'ERP_REMARK', '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'];
|
|
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', 'ERP_REMARK', 'INVOICE_STATUS', 'INVOICING_STATUS', 'EXCHANGE_STATUS', 'WAREHOUSING_STATUS', 'BS_E3_WAREHOUSING_STATUS', 'WDT_WAREHOUSING_STATUS', 'WLN_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 = {
|
|
@@ -18,7 +18,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
|
|
|
18
18
|
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; } }
|
|
19
19
|
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
20
20
|
import React, { useEffect, useMemo, useState, useRef, forwardRef, useImperativeHandle, useContext } from 'react';
|
|
21
|
-
import { Modal } from 'antd';
|
|
21
|
+
import { Form, Modal, Radio } from 'antd';
|
|
22
22
|
import { message } from 'antd';
|
|
23
23
|
import { useMemoizedFn } from 'ahooks';
|
|
24
24
|
import { get, find } from 'lodash';
|
|
@@ -42,8 +42,12 @@ var formProps = {
|
|
|
42
42
|
className: 'customizeFormModalClassName',
|
|
43
43
|
layout: 'vertical'
|
|
44
44
|
};
|
|
45
|
+
var retryDefaultValues = {
|
|
46
|
+
willSkipBusiness: false,
|
|
47
|
+
willSkipCheck: false
|
|
48
|
+
};
|
|
45
49
|
var CurrentNode = function CurrentNode(props, ref) {
|
|
46
|
-
var _currentNodeDetail$no, _currentNodeDetail$no2, _currentNodeDetail$no3, _currentNodeDetail$no4, _currentNodeDetail$no18, _currentNodeDetail$fl, _currentNodeDetail$wo12,
|
|
50
|
+
var _currentNodeDetail$no, _currentNodeDetail$no2, _currentNodeDetail$no3, _currentNodeDetail$no4, _localStorage, _currentNodeDetail$no18, _currentNodeDetail$fl, _currentNodeDetail$wo12, _currentNodeDetail$wo13, _currentNodeDetail$wo14, _currentNodeDetail$wo15, _currentNodeDetail$wo16, _currentNodeDetail$wo17, _currentNodeDetail$wo18, _currentNodeDetail$wo19, _currentNodeDetail$wo20, _currentNodeDetail$wo21, _currentNodeDetail$no22, _currentNodeDetail$no23, _currentNodeDetail$no24, _currentNodeDetail$wo22, _currentNodeDetail$no25, _currentNodeDetail$wo23;
|
|
47
51
|
var formRenderRef = useRef(null);
|
|
48
52
|
useImperativeHandle(ref, function () {
|
|
49
53
|
return {
|
|
@@ -73,11 +77,22 @@ var CurrentNode = function CurrentNode(props, ref) {
|
|
|
73
77
|
autoFillThirdPartyFields = props.autoFillThirdPartyFields;
|
|
74
78
|
var _useContext = useContext(Context),
|
|
75
79
|
dispatch = _useContext.dispatch;
|
|
80
|
+
var _Form$useForm = Form.useForm(),
|
|
81
|
+
_Form$useForm2 = _slicedToArray(_Form$useForm, 1),
|
|
82
|
+
retryForm = _Form$useForm2[0];
|
|
76
83
|
// 是否是编辑状态
|
|
77
84
|
var _useState = useState(false),
|
|
78
85
|
_useState2 = _slicedToArray(_useState, 2),
|
|
79
86
|
editing = _useState2[0],
|
|
80
87
|
setEditing = _useState2[1];
|
|
88
|
+
var _useState3 = useState(false),
|
|
89
|
+
_useState4 = _slicedToArray(_useState3, 2),
|
|
90
|
+
retryModalVisible = _useState4[0],
|
|
91
|
+
setRetryModalVisible = _useState4[1];
|
|
92
|
+
var _useState5 = useState(false),
|
|
93
|
+
_useState6 = _slicedToArray(_useState5, 2),
|
|
94
|
+
retryLoading = _useState6[0],
|
|
95
|
+
setRetryLoading = _useState6[1];
|
|
81
96
|
var controllerRef = useSignal();
|
|
82
97
|
var currentNodeDetail = useSelector(selectCurrentNodeDetail);
|
|
83
98
|
var currentNodeTid = useSelector(selectTid);
|
|
@@ -92,6 +107,7 @@ var CurrentNode = function CurrentNode(props, ref) {
|
|
|
92
107
|
var allShowHideRules = useSelector(selectCurrentFlowAllShowHideRules);
|
|
93
108
|
var assistantMap = useSelector(selectNodeAssistantMap);
|
|
94
109
|
var useGroupMap = useSelector(selectNodeUserGroupMap);
|
|
110
|
+
var isDeveloperMode = typeof localStorage !== 'undefined' && ((_localStorage = localStorage) === null || _localStorage === void 0 ? void 0 : _localStorage.getItem('__isDEV__')) === 'true';
|
|
95
111
|
var tradeKey = useMemo(function () {
|
|
96
112
|
var _currentNodeDetail$wo, _currentNodeDetail$wo2, _currentNodeDetail$wo3, _currentNodeDetail$wo4;
|
|
97
113
|
var tradeConfig = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo = currentNodeDetail.workOrderTemplateInfo) === null || _currentNodeDetail$wo === void 0 ? void 0 : (_currentNodeDetail$wo2 = _currentNodeDetail$wo.componentDtoList) === null || _currentNodeDetail$wo2 === void 0 ? void 0 : _currentNodeDetail$wo2.find(function (item) {
|
|
@@ -245,23 +261,26 @@ var CurrentNode = function CurrentNode(props, ref) {
|
|
|
245
261
|
return _ref.apply(this, arguments);
|
|
246
262
|
};
|
|
247
263
|
}();
|
|
248
|
-
var
|
|
249
|
-
var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
|
|
264
|
+
var executeRestartAutoTask = /*#__PURE__*/function () {
|
|
265
|
+
var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(values) {
|
|
250
266
|
var _currentNodeDetail$wo10, _currentNodeDetail$wo11, _currentNodeDetail$no20;
|
|
251
267
|
var _yield$restartAutoTas, success, _controllerRef$curren2;
|
|
252
268
|
return _regeneratorRuntime().wrap(function _callee2$(_context2) {
|
|
253
269
|
while (1) switch (_context2.prev = _context2.next) {
|
|
254
270
|
case 0:
|
|
255
271
|
_context2.next = 2;
|
|
256
|
-
return restartAutoTask({
|
|
272
|
+
return restartAutoTask(_objectSpread({
|
|
257
273
|
operateParams: _objectSpread(_objectSpread({}, operateParams), {}, {
|
|
258
274
|
flowTemplateId: flowTemplateId,
|
|
259
275
|
flowWorkOrderId: flowWorkOrderId,
|
|
260
276
|
workOrderId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo10 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo10 === void 0 ? void 0 : _currentNodeDetail$wo10.id,
|
|
261
277
|
workOrderUpdateTime: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo11 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo11 === void 0 ? void 0 : _currentNodeDetail$wo11.update,
|
|
262
278
|
nodeId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no20 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no20 === void 0 ? void 0 : _currentNodeDetail$no20.id) || ''
|
|
263
|
-
})
|
|
264
|
-
|
|
279
|
+
}),
|
|
280
|
+
willSkipBusiness: values === null || values === void 0 ? void 0 : values.willSkipBusiness
|
|
281
|
+
}, isDeveloperMode ? {
|
|
282
|
+
willSkipCheck: values === null || values === void 0 ? void 0 : values.willSkipCheck
|
|
283
|
+
} : {}));
|
|
265
284
|
case 2:
|
|
266
285
|
_yield$restartAutoTas = _context2.sent;
|
|
267
286
|
success = _yield$restartAutoTas.success;
|
|
@@ -275,25 +294,69 @@ var CurrentNode = function CurrentNode(props, ref) {
|
|
|
275
294
|
signal: controllerRef === null || controllerRef === void 0 ? void 0 : (_controllerRef$curren2 = controllerRef.current) === null || _controllerRef$curren2 === void 0 ? void 0 : _controllerRef$curren2.signal
|
|
276
295
|
}));
|
|
277
296
|
}
|
|
278
|
-
|
|
297
|
+
return _context2.abrupt("return", success);
|
|
298
|
+
case 6:
|
|
279
299
|
case "end":
|
|
280
300
|
return _context2.stop();
|
|
281
301
|
}
|
|
282
302
|
}, _callee2);
|
|
283
303
|
}));
|
|
284
|
-
return function
|
|
304
|
+
return function executeRestartAutoTask(_x2) {
|
|
285
305
|
return _ref2.apply(this, arguments);
|
|
286
306
|
};
|
|
287
307
|
}();
|
|
308
|
+
var handleRestartAutoTask = function handleRestartAutoTask() {
|
|
309
|
+
retryForm.setFieldsValue(retryDefaultValues);
|
|
310
|
+
setRetryModalVisible(true);
|
|
311
|
+
};
|
|
312
|
+
var handleRetryModalCancel = function handleRetryModalCancel() {
|
|
313
|
+
if (retryLoading) {
|
|
314
|
+
return;
|
|
315
|
+
}
|
|
316
|
+
setRetryModalVisible(false);
|
|
317
|
+
};
|
|
318
|
+
var handleRetryModalOk = /*#__PURE__*/function () {
|
|
319
|
+
var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
|
|
320
|
+
var values, success;
|
|
321
|
+
return _regeneratorRuntime().wrap(function _callee3$(_context3) {
|
|
322
|
+
while (1) switch (_context3.prev = _context3.next) {
|
|
323
|
+
case 0:
|
|
324
|
+
_context3.prev = 0;
|
|
325
|
+
_context3.next = 3;
|
|
326
|
+
return retryForm.validateFields();
|
|
327
|
+
case 3:
|
|
328
|
+
values = _context3.sent;
|
|
329
|
+
setRetryLoading(true);
|
|
330
|
+
_context3.next = 7;
|
|
331
|
+
return executeRestartAutoTask(values);
|
|
332
|
+
case 7:
|
|
333
|
+
success = _context3.sent;
|
|
334
|
+
if (success) {
|
|
335
|
+
setRetryModalVisible(false);
|
|
336
|
+
}
|
|
337
|
+
case 9:
|
|
338
|
+
_context3.prev = 9;
|
|
339
|
+
setRetryLoading(false);
|
|
340
|
+
return _context3.finish(9);
|
|
341
|
+
case 12:
|
|
342
|
+
case "end":
|
|
343
|
+
return _context3.stop();
|
|
344
|
+
}
|
|
345
|
+
}, _callee3, null, [[0,, 9, 12]]);
|
|
346
|
+
}));
|
|
347
|
+
return function handleRetryModalOk() {
|
|
348
|
+
return _ref3.apply(this, arguments);
|
|
349
|
+
};
|
|
350
|
+
}();
|
|
288
351
|
var eventType = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$fl = currentNodeDetail.flowEventData) === null || _currentNodeDetail$fl === void 0 ? void 0 : _currentNodeDetail$fl.eventType;
|
|
289
352
|
var eventConfig = SKIP_NODE_TYPES_CONFIG[eventType];
|
|
290
353
|
var shouldSkipByValidate = typeof eventConfig === 'boolean' || !(eventConfig !== null && eventConfig !== void 0 && eventConfig.validateFn) || eventConfig.validateFn(currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.nodeInfo);
|
|
291
354
|
var showSkipButton = eventType in SKIP_NODE_TYPES_CONFIG && flowStatus && [FlowStatus.FLOWING, FlowStatus.PROCESSING].includes(flowStatus) && shouldSkipByValidate;
|
|
292
355
|
var handleSkip = /*#__PURE__*/function () {
|
|
293
|
-
var
|
|
356
|
+
var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
|
|
294
357
|
var title;
|
|
295
|
-
return _regeneratorRuntime().wrap(function
|
|
296
|
-
while (1) switch (
|
|
358
|
+
return _regeneratorRuntime().wrap(function _callee5$(_context5) {
|
|
359
|
+
while (1) switch (_context5.prev = _context5.next) {
|
|
297
360
|
case 0:
|
|
298
361
|
title = '当前获取物流单号自动化任务正在执行中,确定要跳过吗?跳过后将无法获取物流信息';
|
|
299
362
|
if (typeof eventConfig !== 'boolean') {
|
|
@@ -308,13 +371,13 @@ var CurrentNode = function CurrentNode(props, ref) {
|
|
|
308
371
|
okText: '确认',
|
|
309
372
|
cancelText: '取消',
|
|
310
373
|
onOk: function () {
|
|
311
|
-
var _onOk = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function
|
|
374
|
+
var _onOk = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
|
|
312
375
|
var _currentNodeDetail$no21;
|
|
313
376
|
var _yield$skipNode, success, _controllerRef$curren3;
|
|
314
|
-
return _regeneratorRuntime().wrap(function
|
|
315
|
-
while (1) switch (
|
|
377
|
+
return _regeneratorRuntime().wrap(function _callee4$(_context4) {
|
|
378
|
+
while (1) switch (_context4.prev = _context4.next) {
|
|
316
379
|
case 0:
|
|
317
|
-
|
|
380
|
+
_context4.next = 2;
|
|
318
381
|
return skipNode({
|
|
319
382
|
operateParams: {
|
|
320
383
|
flowTemplateKey: operateParams === null || operateParams === void 0 ? void 0 : operateParams.flowTemplateKey,
|
|
@@ -325,7 +388,7 @@ var CurrentNode = function CurrentNode(props, ref) {
|
|
|
325
388
|
}
|
|
326
389
|
});
|
|
327
390
|
case 2:
|
|
328
|
-
_yield$skipNode =
|
|
391
|
+
_yield$skipNode = _context4.sent;
|
|
329
392
|
success = _yield$skipNode.success;
|
|
330
393
|
if (success) {
|
|
331
394
|
message.success('跳过成功');
|
|
@@ -339,9 +402,9 @@ var CurrentNode = function CurrentNode(props, ref) {
|
|
|
339
402
|
}
|
|
340
403
|
case 5:
|
|
341
404
|
case "end":
|
|
342
|
-
return
|
|
405
|
+
return _context4.stop();
|
|
343
406
|
}
|
|
344
|
-
},
|
|
407
|
+
}, _callee4);
|
|
345
408
|
}));
|
|
346
409
|
function onOk() {
|
|
347
410
|
return _onOk.apply(this, arguments);
|
|
@@ -351,12 +414,12 @@ var CurrentNode = function CurrentNode(props, ref) {
|
|
|
351
414
|
});
|
|
352
415
|
case 3:
|
|
353
416
|
case "end":
|
|
354
|
-
return
|
|
417
|
+
return _context5.stop();
|
|
355
418
|
}
|
|
356
|
-
},
|
|
419
|
+
}, _callee5);
|
|
357
420
|
}));
|
|
358
421
|
return function handleSkip() {
|
|
359
|
-
return
|
|
422
|
+
return _ref4.apply(this, arguments);
|
|
360
423
|
};
|
|
361
424
|
}();
|
|
362
425
|
var isArtificialNode = tag === 'artificial';
|
|
@@ -365,7 +428,7 @@ var CurrentNode = function CurrentNode(props, ref) {
|
|
|
365
428
|
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;
|
|
366
429
|
// TODO: 决策节点给后端修复数据加了一个入口
|
|
367
430
|
// @ts-ignore
|
|
368
|
-
var showRestartAutoTask = tag === 'auto' && flowStatus === FlowStatus.PROCESSING || tag === 'judge' &&
|
|
431
|
+
var showRestartAutoTask = tag === 'auto' && flowStatus === FlowStatus.PROCESSING || tag === 'judge' && isDeveloperMode;
|
|
369
432
|
return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Header, {
|
|
370
433
|
tag: tag,
|
|
371
434
|
nodeName: nodeName,
|
|
@@ -391,7 +454,41 @@ var CurrentNode = function CurrentNode(props, ref) {
|
|
|
391
454
|
flowWorkOrderId: flowWorkOrderId || '',
|
|
392
455
|
nodeId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no22 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no22 === void 0 ? void 0 : _currentNodeDetail$no22.id) || '',
|
|
393
456
|
flowTemplateId: flowTemplateId
|
|
394
|
-
}), /*#__PURE__*/React.createElement(
|
|
457
|
+
}), /*#__PURE__*/React.createElement(Modal, {
|
|
458
|
+
title: "\u6D41\u7A0B\u5931\u8D25\u91CD\u8BD5",
|
|
459
|
+
visible: retryModalVisible,
|
|
460
|
+
width: 620,
|
|
461
|
+
okText: "\u786E\u5B9A",
|
|
462
|
+
cancelText: "\u53D6\u6D88",
|
|
463
|
+
confirmLoading: retryLoading,
|
|
464
|
+
onOk: handleRetryModalOk,
|
|
465
|
+
onCancel: handleRetryModalCancel,
|
|
466
|
+
maskClosable: !retryLoading
|
|
467
|
+
}, /*#__PURE__*/React.createElement(Form, {
|
|
468
|
+
form: retryForm,
|
|
469
|
+
className: styles.retryForm,
|
|
470
|
+
initialValues: retryDefaultValues,
|
|
471
|
+
labelCol: {
|
|
472
|
+
flex: '132px'
|
|
473
|
+
},
|
|
474
|
+
wrapperCol: {
|
|
475
|
+
flex: 1
|
|
476
|
+
}
|
|
477
|
+
}, /*#__PURE__*/React.createElement(Form.Item, {
|
|
478
|
+
label: "\u662F\u5426\u91CD\u65B0\u6267\u884C\u4E1A\u52A1",
|
|
479
|
+
name: "willSkipBusiness"
|
|
480
|
+
}, /*#__PURE__*/React.createElement(Radio.Group, null, /*#__PURE__*/React.createElement(Radio, {
|
|
481
|
+
value: true
|
|
482
|
+
}, "\u8DF3\u8FC7\u4E1A\u52A1"), /*#__PURE__*/React.createElement(Radio, {
|
|
483
|
+
value: false
|
|
484
|
+
}, "\u4E0D\u8DF3\u8FC7\u4E1A\u52A1"))), isDeveloperMode && /*#__PURE__*/React.createElement(Form.Item, {
|
|
485
|
+
label: "\u662F\u5426\u8DF3\u8FC7\u6821\u9A8C",
|
|
486
|
+
name: "willSkipCheck"
|
|
487
|
+
}, /*#__PURE__*/React.createElement(Radio.Group, null, /*#__PURE__*/React.createElement(Radio, {
|
|
488
|
+
value: true
|
|
489
|
+
}, "\u662F"), /*#__PURE__*/React.createElement(Radio, {
|
|
490
|
+
value: false
|
|
491
|
+
}, "\u5426"))))), /*#__PURE__*/React.createElement("div", {
|
|
395
492
|
className: styles.formRenderContainer
|
|
396
493
|
}, [NodeType.START_NODE, NodeType.EXECUTE_NODE].includes(currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no23 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no23 === void 0 ? void 0 : _currentNodeDetail$no23.nodeType) && (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo) && (flowStatus === FlowStatus.COMPLETED && !editing ? /*#__PURE__*/React.createElement(RenderDetail, {
|
|
397
494
|
workOrderTemplateInfo: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo,
|
|
@@ -7,4 +7,4 @@
|
|
|
7
7
|
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
|
|
8
8
|
*/
|
|
9
9
|
// 切换当前店铺时,以下组件字段需要清空
|
|
10
|
-
export var NEED_CLEAR_FIELDS_WHEN_SHOP_ID_CHANGE = ['BS_E3_LOGISTICS', 'BS_E3_SEND_GOOD', 'ITEM_SELECT_THIRD', 'STATUS', 'ITEM_SELECT', 'ITEM_ID', 'ITEM_ENCODE', 'JST_LOGISTICS', 'JST_ITEM_SELECT_THIRD', 'JST_SUPPLY', 'JST_SEND_GOOD', 'BS_GOODS', 'BS_EXCHANGE_GOODS', 'BS_REISSUE_GOODS', 'BS_RETURN_GOODS', 'BS_LOGISTICS', 'BS_SEND_GOOD', 'BS_SYSTEM_ORDER', 'WLN_SYSTEM_ORDER', 'WLN_GOODS', 'WLN_LOGISTICS', 'WLN_SEND_GOOD', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WDT_SYSTEM_ORDER', 'WDT_REISSUE_GOODS', 'WDT_RETURN_GOODS', 'WDT_SHOP', 'WDT_EXCHANGE_GOODS', 'KM_EXCHANGE_GOODS', 'KM_SYSTEM_ORDER', 'KM_SEND_GOOD', 'KM_RETURN_WAREHOUSE', 'KM_LOGISTICS', 'KM_GOODS', 'KM_REISSUE_GOODS', 'KM_RETURN_GOODS', 'BS_E3_SYSTEM_ORDER', 'JST_SYSTEM_ORDER', 'JST_GOODS', 'JST_REISSUE_GOODS', 'JST_RETURN_GOODS', 'JST_EXCHANGE_GOODS', 'BS_E3_REISSUE_GOODS', 'GY_SYSTEM_ORDER', 'GY_SEND_GOOD', 'GY_GOODS', 'GY_REISSUE_GOODS', 'GY_RETURN_GOODS', 'GY_LOGISTICS', 'JY_SYSTEM_ORDER', 'JY_SEND_GOOD', 'JY_GOODS', 'JY_REISSUE_GOODS', 'JY_RETURN_GOODS', 'JY_LOGISTICS', 'JKY_SYSTEM_ORDER', 'JKY_SEND_GOOD', 'JKY_GOODS', 'JKY_REISSUE_GOODS', 'JKY_RETURN_GOODS', 'JKY_LOGISTICS', 'SKX_OUTBOUND_NOTICE_NO', 'SKX_RETURN_BILL_NO', 'SKX_REFUND_BILL_NO', 'SKX_SHOP_NAME', 'SKX_WAREHOUSE', 'SKX_LOGISTICS', 'SKX_RETURN_LOGISTICS', 'SKX_GOODS', 'SKX_RETURN_GOODS', 'SKX_ORDER_TYPE', 'SKX_RETURN_ORDER_STATUS', 'SKX_ORDER_STATUS', 'SKX_CREATE_TIME'];
|
|
10
|
+
export var NEED_CLEAR_FIELDS_WHEN_SHOP_ID_CHANGE = ['BS_E3_LOGISTICS', 'BS_E3_SEND_GOOD', 'ITEM_SELECT_THIRD', 'STATUS', 'ITEM_SELECT', 'ITEM_ID', 'ITEM_ENCODE', 'JST_LOGISTICS', 'JST_ITEM_SELECT_THIRD', 'JST_SUPPLY', 'JST_SEND_GOOD', 'BS_GOODS', 'BS_EXCHANGE_GOODS', 'BS_REISSUE_GOODS', 'BS_RETURN_GOODS', 'BS_LOGISTICS', 'BS_SEND_GOOD', 'BS_SYSTEM_ORDER', 'WLN_SYSTEM_ORDER', 'WLN_GOODS', 'WLN_LOGISTICS', 'WLN_SEND_GOOD', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WDT_SYSTEM_ORDER', 'WDT_REISSUE_GOODS', 'WDT_RETURN_GOODS', 'WDT_SHOP', 'WDT_EXCHANGE_GOODS', 'KM_EXCHANGE_GOODS', 'KM_SYSTEM_ORDER', 'KM_SEND_GOOD', 'KM_RETURN_WAREHOUSE', 'KM_LOGISTICS', 'KM_GOODS', 'KM_REISSUE_GOODS', 'KM_RETURN_GOODS', 'BS_E3_SYSTEM_ORDER', 'JST_SYSTEM_ORDER', 'JST_GOODS', 'JST_REISSUE_GOODS', 'JST_RETURN_GOODS', 'JST_EXCHANGE_GOODS', 'BS_E3_REISSUE_GOODS', 'GY_SYSTEM_ORDER', 'GY_SEND_GOOD', 'GY_GOODS', 'GY_REISSUE_GOODS', 'GY_RETURN_GOODS', 'GY_LOGISTICS', 'JY_SYSTEM_ORDER', 'JY_SEND_GOOD', 'JY_GOODS', 'JY_REISSUE_GOODS', 'JY_RETURN_GOODS', 'JY_LOGISTICS', 'JKY_SYSTEM_ORDER', 'JKY_SEND_GOOD', 'JKY_GOODS', 'JKY_REISSUE_GOODS', 'WLN_REISSUE_GOODS', 'JKY_RETURN_GOODS', 'JKY_LOGISTICS', 'SKX_OUTBOUND_NOTICE_NO', 'SKX_RETURN_BILL_NO', 'SKX_REFUND_BILL_NO', 'SKX_SHOP_NAME', 'SKX_WAREHOUSE', 'SKX_LOGISTICS', 'SKX_RETURN_LOGISTICS', 'SKX_GOODS', 'SKX_RETURN_GOODS', 'SKX_ORDER_TYPE', 'SKX_RETURN_ORDER_STATUS', 'SKX_ORDER_STATUS', 'SKX_CREATE_TIME'];
|
|
@@ -117,6 +117,10 @@ var SystemOrderCard = function SystemOrderCard(_ref) {
|
|
|
117
117
|
var _JSON$parse3, _JSON$parse3$plugins, _JSON$parse3$plugins$;
|
|
118
118
|
return ((_JSON$parse3 = JSON.parse(state.workOrder.userInfo.companyUserConfig || '{}')) === null || _JSON$parse3 === void 0 ? void 0 : (_JSON$parse3$plugins = _JSON$parse3.plugins) === null || _JSON$parse3$plugins === void 0 ? void 0 : (_JSON$parse3$plugins$ = _JSON$parse3$plugins.juYi) === null || _JSON$parse3$plugins$ === void 0 ? void 0 : _JSON$parse3$plugins$.show) || false;
|
|
119
119
|
});
|
|
120
|
+
var hasBindWln = useAppSelector(function (state) {
|
|
121
|
+
var _JSON$parse4, _JSON$parse4$plugins, _JSON$parse4$plugins$;
|
|
122
|
+
return ((_JSON$parse4 = JSON.parse(state.workOrder.userInfo.companyUserConfig || '{}')) === null || _JSON$parse4 === void 0 ? void 0 : (_JSON$parse4$plugins = _JSON$parse4.plugins) === null || _JSON$parse4$plugins === void 0 ? void 0 : (_JSON$parse4$plugins$ = _JSON$parse4$plugins.wln) === null || _JSON$parse4$plugins$ === void 0 ? void 0 : _JSON$parse4$plugins$.show) || false;
|
|
123
|
+
});
|
|
120
124
|
var hasSuperAdminRole = useAppSelector(function (state) {
|
|
121
125
|
return state.workOrder.userInfo.hasSuperAdminRole;
|
|
122
126
|
});
|
|
@@ -427,7 +431,7 @@ var SystemOrderCard = function SystemOrderCard(_ref) {
|
|
|
427
431
|
shopId: shopId,
|
|
428
432
|
userKey: userKey,
|
|
429
433
|
companyKey: companyKey,
|
|
430
|
-
bindERP: bindERP || hasBindWdt || hasBindJst || hasBindJuYi,
|
|
434
|
+
bindERP: bindERP || hasBindWdt || hasBindJst || hasBindJuYi || hasBindWln,
|
|
431
435
|
hasSuperAdminRole: hasSuperAdminRole
|
|
432
436
|
},
|
|
433
437
|
otherInfo: {},
|
|
@@ -192,6 +192,10 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref4) {
|
|
|
192
192
|
var _JSON$parse3, _JSON$parse3$plugins, _JSON$parse3$plugins$;
|
|
193
193
|
return ((_JSON$parse3 = JSON.parse(state.workOrder.userInfo.companyUserConfig || '{}')) === null || _JSON$parse3 === void 0 ? void 0 : (_JSON$parse3$plugins = _JSON$parse3.plugins) === null || _JSON$parse3$plugins === void 0 ? void 0 : (_JSON$parse3$plugins$ = _JSON$parse3$plugins.juYi) === null || _JSON$parse3$plugins$ === void 0 ? void 0 : _JSON$parse3$plugins$.show) || false;
|
|
194
194
|
});
|
|
195
|
+
var hasBindWln = useAppSelector(function (state) {
|
|
196
|
+
var _JSON$parse4, _JSON$parse4$plugins, _JSON$parse4$plugins$;
|
|
197
|
+
return ((_JSON$parse4 = JSON.parse(state.workOrder.userInfo.companyUserConfig || '{}')) === null || _JSON$parse4 === void 0 ? void 0 : (_JSON$parse4$plugins = _JSON$parse4.plugins) === null || _JSON$parse4$plugins === void 0 ? void 0 : (_JSON$parse4$plugins$ = _JSON$parse4$plugins.wln) === null || _JSON$parse4$plugins$ === void 0 ? void 0 : _JSON$parse4$plugins$.show) || false;
|
|
198
|
+
});
|
|
195
199
|
var hasSuperAdminRole = useAppSelector(function (state) {
|
|
196
200
|
return state.workOrder.userInfo.hasSuperAdminRole;
|
|
197
201
|
});
|
|
@@ -696,7 +700,7 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref4) {
|
|
|
696
700
|
shopId: shopId,
|
|
697
701
|
userKey: userKey,
|
|
698
702
|
companyKey: companyKey,
|
|
699
|
-
bindERP: bindERP || hasBindWdt || hasBindJst || hasBindJuYi,
|
|
703
|
+
bindERP: bindERP || hasBindWdt || hasBindJst || hasBindJuYi || hasBindWln,
|
|
700
704
|
hasSuperAdminRole: hasSuperAdminRole
|
|
701
705
|
},
|
|
702
706
|
otherInfo: _objectSpread(_objectSpread({}, otherInfo), {}, {
|
|
@@ -90,6 +90,18 @@ 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
|
+
WLN_OBTAIN_REISSUE_ORDER: {
|
|
94
|
+
name: '获取补发单id(万里牛)',
|
|
95
|
+
tips: '补发单id'
|
|
96
|
+
},
|
|
97
|
+
WLN_OBTAIN_REISSUE_LOGISTICS: {
|
|
98
|
+
name: '获取补发物流单号(万里牛)',
|
|
99
|
+
tips: '补发物流信息'
|
|
100
|
+
},
|
|
101
|
+
WLN_STORE_STATUS: {
|
|
102
|
+
name: '退货入库状态(万里牛)',
|
|
103
|
+
tips: '万里牛商品入库状态'
|
|
104
|
+
},
|
|
93
105
|
GY_OBTAIN_REISSUE_OR_EXCHANGE_ORDER: {
|
|
94
106
|
name: '获取补发/换货单id(管易退货单接口补发/换货)',
|
|
95
107
|
tips: '补发单id/换货单id'
|
|
@@ -185,6 +185,10 @@ export var SUBMIT_COMPONENT_STATUS_MAP = {
|
|
|
185
185
|
status: 'erpAfterSaleStatusValue',
|
|
186
186
|
reason: 'erpAfterSaleStatusReason'
|
|
187
187
|
},
|
|
188
|
+
ERP_AFTER_SALES_ORDER_REVIEW_STATUS: {
|
|
189
|
+
status: 'erpAfterSalesOrderReviewStatusValue',
|
|
190
|
+
reason: 'erpAfterSalesOrderReviewStatusReason'
|
|
191
|
+
},
|
|
188
192
|
RETURN_EXCHANGE_GOODS_REVIEW_STATUS: {
|
|
189
193
|
status: 'returnExchangeGoodsReviewStatusValue',
|
|
190
194
|
reason: 'returnExchangeGoodsReviewStatusReason'
|
|
@@ -223,6 +227,10 @@ export var SUBMIT_COMPONENT_GOOD_STATUS_MAP = {
|
|
|
223
227
|
list: 'wdtInStockStatusItemList',
|
|
224
228
|
status: 'wdtInStockStatusList'
|
|
225
229
|
},
|
|
230
|
+
WLN_WAREHOUSING_STATUS: {
|
|
231
|
+
list: 'wlnInStockStatusItemList',
|
|
232
|
+
status: 'wlnInStockStatusList'
|
|
233
|
+
},
|
|
226
234
|
JKY_WAREHOUSING_STATUS: {
|
|
227
235
|
list: 'jkyInStockStatusItemList',
|
|
228
236
|
status: 'jkyInStockStatusList'
|
|
@@ -396,6 +404,12 @@ export var SUBMIT_COMPONENT_REISSUE_MAP = {
|
|
|
396
404
|
goods: 'jkyReissueGoods',
|
|
397
405
|
shopCode: 'shopCode',
|
|
398
406
|
systemOrderNo: 'jkySystemOrderNo'
|
|
407
|
+
},
|
|
408
|
+
WLN_REISSUE_GOODS: {
|
|
409
|
+
type: 'wlnReissueType',
|
|
410
|
+
goods: 'wlnReissueGoods',
|
|
411
|
+
shopCode: 'shopCode',
|
|
412
|
+
systemOrderNo: 'wlnSystemOrderNo'
|
|
399
413
|
}
|
|
400
414
|
};
|
|
401
415
|
export var SUBMIT_COMPONENT_RETURN_GOODS_MAP = {
|
|
@@ -627,7 +627,7 @@ var handleBsOrWdtReissueGoods = function handleBsOrWdtReissueGoods(_ref46) {
|
|
|
627
627
|
if (item.workOrderComponentType !== 'GY_REISSUE_GOODS') {
|
|
628
628
|
addContent(SUBMIT_COMPONENT_REISSUE_MAP[item.workOrderComponentType].shopCode, (reissue === null || reissue === void 0 ? void 0 : reissue.shopCode) || '');
|
|
629
629
|
}
|
|
630
|
-
if (item.workOrderComponentType === 'WDT_REISSUE_GOODS' || item.workOrderComponentType === 'JST_REISSUE_GOODS' || item.workOrderComponentType === 'JST_RETURN_GOODS' || item.workOrderComponentType === 'GY_REISSUE_GOODS' || item.workOrderComponentType === 'KM_REISSUE_GOODS' || item.workOrderComponentType === 'JY_REISSUE_GOODS' || item.workOrderComponentType === 'JKY_REISSUE_GOODS') {
|
|
630
|
+
if (item.workOrderComponentType === 'WDT_REISSUE_GOODS' || item.workOrderComponentType === 'JST_REISSUE_GOODS' || item.workOrderComponentType === 'JST_RETURN_GOODS' || item.workOrderComponentType === 'GY_REISSUE_GOODS' || item.workOrderComponentType === 'KM_REISSUE_GOODS' || item.workOrderComponentType === 'JY_REISSUE_GOODS' || item.workOrderComponentType === 'JKY_REISSUE_GOODS' || item.workOrderComponentType === 'WLN_REISSUE_GOODS') {
|
|
631
631
|
addContent(SUBMIT_COMPONENT_REISSUE_MAP[item.workOrderComponentType].systemOrderNo, (reissue === null || reissue === void 0 ? void 0 : reissue[SUBMIT_COMPONENT_REISSUE_MAP[item.workOrderComponentType].systemOrderNo]) || '');
|
|
632
632
|
}
|
|
633
633
|
// 管易补发商品信息vipCode/shopCode未复现出丢失情况,兜底措施
|
|
@@ -931,6 +931,7 @@ var processComponent = function processComponent(_ref63) {
|
|
|
931
931
|
case 'REPAIR_ORDER_STATUS':
|
|
932
932
|
case 'REJECT_REFUND_STATUS':
|
|
933
933
|
case 'ERP_AFTER_SALE_STATUS':
|
|
934
|
+
case 'ERP_AFTER_SALES_ORDER_REVIEW_STATUS':
|
|
934
935
|
case 'AGREE_RETURN_GOODS_STATUS':
|
|
935
936
|
case 'REJECT_RETURN_GOODS_STATUS':
|
|
936
937
|
case 'RETURN_EXCHANGE_GOODS_REVIEW_STATUS':
|
|
@@ -942,6 +943,7 @@ var processComponent = function processComponent(_ref63) {
|
|
|
942
943
|
case 'BS_E3_WAREHOUSING_STATUS':
|
|
943
944
|
case 'MSG_STATUS':
|
|
944
945
|
case 'WDT_WAREHOUSING_STATUS':
|
|
946
|
+
case 'WLN_WAREHOUSING_STATUS':
|
|
945
947
|
case 'JKY_WAREHOUSING_STATUS':
|
|
946
948
|
wrapFn(handleGoodStatus);
|
|
947
949
|
break;
|
|
@@ -1087,6 +1089,7 @@ var processComponent = function processComponent(_ref63) {
|
|
|
1087
1089
|
case 'KM_REISSUE_GOODS':
|
|
1088
1090
|
case 'JY_REISSUE_GOODS':
|
|
1089
1091
|
case 'JKY_REISSUE_GOODS':
|
|
1092
|
+
case 'WLN_REISSUE_GOODS':
|
|
1090
1093
|
wrapFn(handleBsOrWdtReissueGoods);
|
|
1091
1094
|
break;
|
|
1092
1095
|
case 'BS_RETURN_GOODS':
|
|
@@ -421,8 +421,11 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
421
421
|
detail: bsOrders || {}
|
|
422
422
|
});
|
|
423
423
|
wlnInfo = wlnOrders && wlnOrderTransform(_objectSpread(_objectSpread({}, wlnOrders), {}, {
|
|
424
|
-
allOrders: wlnOrders.orders
|
|
425
|
-
|
|
424
|
+
allOrders: wlnOrders.orders,
|
|
425
|
+
trades: wlnOrders.orders,
|
|
426
|
+
orderNo: order_no,
|
|
427
|
+
componentList: templateDetail.componentDtoList
|
|
428
|
+
}), form);
|
|
426
429
|
bsE3Info = bsE3Orders && bsE3OrderTransform(_objectSpread(_objectSpread({}, bsE3Orders), {}, {
|
|
427
430
|
componentList: templateDetail.componentDtoList,
|
|
428
431
|
orderNo: order_no,
|
|
@@ -1160,6 +1163,7 @@ export var reversalFormValues = function reversalFormValues() {
|
|
|
1160
1163
|
case 'KM_REISSUE_GOODS':
|
|
1161
1164
|
case 'JY_REISSUE_GOODS':
|
|
1162
1165
|
case 'JKY_REISSUE_GOODS':
|
|
1166
|
+
case 'WLN_REISSUE_GOODS':
|
|
1163
1167
|
case 'KM_RETURN_GOODS':
|
|
1164
1168
|
prv["".concat(next.uniqueKey, "_shopCode")] = values[next.uniqueKey]['shopCode'];
|
|
1165
1169
|
break;
|
|
@@ -1359,18 +1363,20 @@ export var wlnSystemOrderBackValues = function wlnSystemOrderBackValues(_ref11)
|
|
|
1359
1363
|
form = _ref11.form;
|
|
1360
1364
|
//如果没有选择的值不返填,会有两种情况 1.有值为空 2.没有值 为空的时候需要返填
|
|
1361
1365
|
if (!(value !== null && value !== void 0 && value.selectedRows)) return;
|
|
1362
|
-
var
|
|
1366
|
+
var wlnGoodsComponent = (_templateList$compone6 = templateList.componentDtoList) === null || _templateList$compone6 === void 0 ? void 0 : _templateList$compone6.filter(function (item) {
|
|
1363
1367
|
return ['WLN_GOODS', 'WLN_SEND_GOOD', 'WLN_LOGISTICS'].includes(item.workOrderComponentType);
|
|
1364
1368
|
});
|
|
1365
|
-
if (!(
|
|
1366
|
-
var wlnGoodsValue = form.getFieldValue(
|
|
1369
|
+
if (!(wlnGoodsComponent !== null && wlnGoodsComponent !== void 0 && wlnGoodsComponent.length)) return;
|
|
1370
|
+
var wlnGoodsValue = form.getFieldValue(wlnGoodsComponent[0].uniqueKey);
|
|
1367
1371
|
var orderInfo = wlnOrderTransform({
|
|
1372
|
+
trades: value.selectedRows,
|
|
1368
1373
|
orders: value.selectedRows,
|
|
1369
1374
|
shopCode: wlnGoodsValue.shopCode,
|
|
1370
|
-
allOrders: value === null || value === void 0 ? void 0 : value.orders
|
|
1371
|
-
|
|
1375
|
+
allOrders: value === null || value === void 0 ? void 0 : value.orders,
|
|
1376
|
+
componentList: templateList.componentDtoList
|
|
1377
|
+
}, form);
|
|
1372
1378
|
var values = wlnOrderBackFormValues(orderInfo, {
|
|
1373
|
-
componentDtoList:
|
|
1379
|
+
componentDtoList: wlnGoodsComponent
|
|
1374
1380
|
});
|
|
1375
1381
|
form.setFieldsValue(values);
|
|
1376
1382
|
};
|
|
@@ -7,7 +7,7 @@ var orderBackKeyListMap = {
|
|
|
7
7
|
hasKm: ['KM_SYSTEM_ORDER', 'KM_LOGISTICS', 'KM_GOODS', 'KM_REISSUE_GOODS', 'KM_RETURN_GOODS'],
|
|
8
8
|
hasWdt: ['WDT_SYSTEM_ORDER', 'WDT_GOODS', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WDT_REISSUE_GOODS', 'WDT_SHOP', 'WDT_RETURN_BILL_NO'],
|
|
9
9
|
hasBsE3: ['BS_E3_SYSTEM_ORDER', 'BS_E3_GOODS', 'BS_E3_REISSUE_GOODS', 'BS_E3_LOGISTICS', 'BS_E3_SEND_GOOD'],
|
|
10
|
-
hasWln: ['WLN_SYSTEM_ORDER', 'WLN_GOODS', 'WLN_LOGISTICS', 'WLN_SEND_GOOD'],
|
|
10
|
+
hasWln: ['WLN_SYSTEM_ORDER', 'WLN_GOODS', 'WLN_LOGISTICS', 'WLN_SEND_GOOD', 'WLN_REISSUE_GOODS'],
|
|
11
11
|
hasGy: ['GY_SYSTEM_ORDER', 'GY_SEND_GOOD', 'GY_GOODS', 'GY_REISSUE_GOODS', 'GY_RETURN_GOODS', 'GY_LOGISTICS'],
|
|
12
12
|
hasJy: ['JY_SYSTEM_ORDER', 'JY_SEND_GOOD', 'JY_GOODS', 'JY_REISSUE_GOODS', 'JY_RETURN_GOODS', 'JY_LOGISTICS'],
|
|
13
13
|
hasSkx: ['SKX_OUTBOUND_NOTICE_NO'],
|
|
@@ -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,
|
|
@@ -437,6 +437,10 @@ var processCallBackStatus = function processCallBackStatus(getValue) {
|
|
|
437
437
|
status: 'erpAfterSaleStatusValue',
|
|
438
438
|
reason: 'erpAfterSaleStatusReason'
|
|
439
439
|
},
|
|
440
|
+
ERP_AFTER_SALES_ORDER_REVIEW_STATUS: {
|
|
441
|
+
status: 'erpAfterSalesOrderReviewStatusValue',
|
|
442
|
+
reason: 'erpAfterSalesOrderReviewStatusReason'
|
|
443
|
+
},
|
|
440
444
|
RETURN_EXCHANGE_GOODS_REVIEW_STATUS: {
|
|
441
445
|
status: 'returnExchangeGoodsReviewStatusValue',
|
|
442
446
|
reason: 'returnExchangeGoodsReviewStatusReason'
|
|
@@ -465,7 +469,8 @@ var processSceneStatus = function processSceneStatus(getValue) {
|
|
|
465
469
|
BS_E3_WAREHOUSING_STATUS: 'bsE3InStockStatusItemList',
|
|
466
470
|
MSG_STATUS: 'msgStatusValues',
|
|
467
471
|
WDT_WAREHOUSING_STATUS: 'wdtInStockStatusItemList',
|
|
468
|
-
JKY_WAREHOUSING_STATUS: 'jkyInStockStatusItemList'
|
|
472
|
+
JKY_WAREHOUSING_STATUS: 'jkyInStockStatusItemList',
|
|
473
|
+
WLN_WAREHOUSING_STATUS: 'wlnInStockStatusItemList'
|
|
469
474
|
};
|
|
470
475
|
return _defineProperty({}, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_").concat(STATUS_LIST_MAP[nex.workOrderComponentType])), []));
|
|
471
476
|
};
|
|
@@ -1214,6 +1219,28 @@ var processJkyReissueGoods = function processJkyReissueGoods(templateColumns) {
|
|
|
1214
1219
|
};
|
|
1215
1220
|
};
|
|
1216
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
|
+
};
|
|
1217
1244
|
var processGyReissueGoods = function processGyReissueGoods(templateColumns) {
|
|
1218
1245
|
return function (getValue) {
|
|
1219
1246
|
return function (nex, config) {
|
|
@@ -1307,14 +1334,14 @@ var processJstReturnGoods = function processJstReturnGoods(templateColumns) {
|
|
|
1307
1334
|
};
|
|
1308
1335
|
var processLabel = function processLabel(getValue) {
|
|
1309
1336
|
return function (nex, config) {
|
|
1310
|
-
var
|
|
1311
|
-
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;
|
|
1312
1339
|
};
|
|
1313
1340
|
};
|
|
1314
1341
|
var processMemberLevel = function processMemberLevel(getValue) {
|
|
1315
1342
|
return function (nex, config) {
|
|
1316
|
-
var
|
|
1317
|
-
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;
|
|
1318
1345
|
};
|
|
1319
1346
|
};
|
|
1320
1347
|
var processAfterSalesOrderId = function processAfterSalesOrderId(getValue) {
|
|
@@ -1381,6 +1408,9 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
|
|
|
1381
1408
|
RECEIVER_ADDRESS_INPUT: processReceiverAddressInput,
|
|
1382
1409
|
SUBFORM: processSubForm,
|
|
1383
1410
|
ERP_REMARK: processCallBackStatus,
|
|
1411
|
+
ERP_AFTER_SALES_ORDER_REVIEW_STATUS: processCallBackStatus,
|
|
1412
|
+
WLN_WAREHOUSING_STATUS: processSceneStatus,
|
|
1413
|
+
WLN_REISSUE_GOODS: processWlnReissueGoods(templateColumns),
|
|
1384
1414
|
EXPRESS_LOGISTICS_SELECT: processExpressLogisticsSelect,
|
|
1385
1415
|
RETURN_LOGISTICS_SELECT: processReturnLogisticsSelect,
|
|
1386
1416
|
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.8.
|
|
3
|
+
"version": "2.8.3",
|
|
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.8.
|
|
36
|
-
"@kmkf-fe-packages/kmkf-utils": "2.8.
|
|
37
|
-
"@kmkf-fe-packages/services-components": "2.8.
|
|
35
|
+
"@kmkf-fe-packages/basic-components": "2.8.3",
|
|
36
|
+
"@kmkf-fe-packages/kmkf-utils": "2.8.3",
|
|
37
|
+
"@kmkf-fe-packages/services-components": "2.8.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": "903dfd34fdb4dc7baf60d4ff2563869bfe02c43c",
|
|
79
79
|
"gitHooks": {
|
|
80
80
|
"pre-commit": "lint-staged"
|
|
81
81
|
}
|