@kmkf-fe-packages/kmkf-work-order-service-component 1.0.3 → 1.0.4-rc.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/esm/FlowTemplateDetail/components/FormRender/index.js +54 -9
- package/dist/esm/FlowTemplateDetail/components/FormRender/index.less +3 -0
- package/dist/esm/FlowTemplateDetail/components/Item/index.d.ts +3 -0
- package/dist/esm/FlowTemplateDetail/components/Item/index.js +27 -13
- package/dist/esm/FlowTemplateDetail/components/RemarkListModal/index.js +4 -1
- package/dist/esm/FlowTemplateDetail/components/RemarkShow/index.js +4 -1
- package/dist/esm/FlowTemplateDetail/index.js +31 -5
- package/dist/esm/FlowTemplateDetail/index.less +4 -0
- package/dist/esm/WdtTradeList/components/OrderDrawer.d.ts +7 -0
- package/dist/esm/WdtTradeList/components/OrderDrawer.js +79 -0
- package/dist/esm/WdtTradeList/components/OrderForm/ReissueItems.d.ts +11 -0
- package/dist/esm/WdtTradeList/components/OrderForm/ReissueItems.js +178 -0
- package/dist/esm/WdtTradeList/components/OrderForm/index.d.ts +11 -0
- package/dist/esm/WdtTradeList/components/OrderForm/index.js +79 -0
- package/dist/esm/WdtTradeList/components/Search.d.ts +6 -0
- package/dist/esm/WdtTradeList/components/Search.js +22 -0
- package/dist/esm/WdtTradeList/components/TradeList.d.ts +10 -0
- package/dist/esm/WdtTradeList/components/TradeList.js +153 -0
- package/dist/esm/WdtTradeList/components/fields/Address.d.ts +7 -0
- package/dist/esm/WdtTradeList/components/fields/Address.js +60 -0
- package/dist/esm/WdtTradeList/components/fields/Goods/SelectDrawer.d.ts +8 -0
- package/dist/esm/WdtTradeList/components/fields/Goods/SelectDrawer.js +160 -0
- package/dist/esm/WdtTradeList/components/fields/Goods/index.d.ts +9 -0
- package/dist/esm/WdtTradeList/components/fields/Goods/index.js +158 -0
- package/dist/esm/WdtTradeList/components/fields/LogisticsCode.d.ts +6 -0
- package/dist/esm/WdtTradeList/components/fields/LogisticsCode.js +39 -0
- package/dist/esm/WdtTradeList/components/fields/Warehouse.d.ts +7 -0
- package/dist/esm/WdtTradeList/components/fields/Warehouse.js +43 -0
- package/dist/esm/WdtTradeList/components/index.less +500 -0
- package/dist/esm/WdtTradeList/index.d.ts +16 -0
- package/dist/esm/WdtTradeList/index.js +155 -0
- package/dist/esm/WdtTradeList/interface.d.ts +74 -0
- package/dist/esm/WdtTradeList/interface.js +4 -0
- package/dist/esm/WdtTradeList/util.d.ts +1 -0
- package/dist/esm/WdtTradeList/util.js +35 -0
- package/dist/esm/WorkOrder/components/WorkOrderList/components/CustomizeWorkOrderCard/index.less +1 -0
- package/dist/esm/WorkOrder/index.js +25 -2
- package/dist/esm/common/utils/tools.js +41 -27
- package/dist/esm/index.d.ts +1 -0
- package/dist/esm/index.js +1 -0
- package/dist/esm/model/flowTemplateDetail/index.js +2 -1
- package/dist/esm/model/flowTemplateDetail/types.d.ts +1 -0
- package/dist/esm/model/servers/api.d.ts +1 -0
- package/dist/esm/model/servers/api.js +9 -0
- package/dist/esm/model/servers/request.d.ts +1 -1
- package/package.json +5 -5
|
@@ -28,7 +28,7 @@ import { get, some, set, every, cloneDeep, isEmpty, intersection, throttle } fro
|
|
|
28
28
|
import 'moment/locale/zh-cn';
|
|
29
29
|
import { calcWorkOrderList, orderBack, getReplaceWarnValues, COMPONENT_MAP_NAME, EXCLUDE_REPLACE_TOP_COMPONENT,
|
|
30
30
|
// 重复检验不需要展示在顶部的
|
|
31
|
-
INNER_REPLACE_COMPONENT, reversalFormValues, bsSystemOrderBackValues, wlnSystemOrderBackValues, getMappingConfigByTemplateDetail, wdtSystemOrderBackValues, setLogisticsInfo } from "../../../common/utils/tools";
|
|
31
|
+
INNER_REPLACE_COMPONENT, reversalFormValues, bsSystemOrderBackValues, wlnSystemOrderBackValues, getMappingConfigByTemplateDetail, wdtSystemOrderBackValues, setLogisticsInfo, COMPONENT_MAP } from "../../../common/utils/tools";
|
|
32
32
|
import { replaceCheck, orderDetail } from "../../../model/servers/api";
|
|
33
33
|
import { factory } from '@kmkf-fe-packages/services-components';
|
|
34
34
|
import { getExpression, formatDisplayConfig, isNull } from '@kmkf-fe-packages/kmkf-utils';
|
|
@@ -179,7 +179,7 @@ var FormRender = function FormRender(props, ref) {
|
|
|
179
179
|
var obj = {};
|
|
180
180
|
Object.keys(params).forEach(function (key) {
|
|
181
181
|
var _params$key;
|
|
182
|
-
if (params[key] && ((_params$key = params[key]) === null || _params$key === void 0 ? void 0 : _params$key.indexOf('*')) > -1) {
|
|
182
|
+
if (params[key] && typeof params[key] === 'string' && ((_params$key = params[key]) === null || _params$key === void 0 ? void 0 : _params$key.indexOf('*')) > -1) {
|
|
183
183
|
obj[key] = 0;
|
|
184
184
|
}
|
|
185
185
|
});
|
|
@@ -432,8 +432,45 @@ var FormRender = function FormRender(props, ref) {
|
|
|
432
432
|
(antFormEl === null || antFormEl === void 0 ? void 0 : antFormEl.length) > 0 && set(antFormEl, '0.scrollTop', 0);
|
|
433
433
|
resetMappdingHideComponents();
|
|
434
434
|
};
|
|
435
|
+
var repeatWarningDataSchema = function repeatWarningDataSchema(formValue, templateDetail) {
|
|
436
|
+
var getKeyByValue = function getKeyByValue(value) {
|
|
437
|
+
return Object.keys(COMPONENT_MAP).find(function (key) {
|
|
438
|
+
return COMPONENT_MAP[key] === value;
|
|
439
|
+
});
|
|
440
|
+
};
|
|
441
|
+
var needRepeatWarnComponent = Object.values(COMPONENT_MAP);
|
|
442
|
+
return templateDetail.componentDtoList.reduce(function (cur, nxt) {
|
|
443
|
+
if (needRepeatWarnComponent !== null && needRepeatWarnComponent !== void 0 && needRepeatWarnComponent.includes(nxt === null || nxt === void 0 ? void 0 : nxt.workOrderComponentType)) {
|
|
444
|
+
var instance = factory(nxt.workOrderComponentType, {
|
|
445
|
+
id: nxt.uniqueKey,
|
|
446
|
+
name: nxt.name,
|
|
447
|
+
componentConfig: nxt.componentConfig,
|
|
448
|
+
effects: {},
|
|
449
|
+
type: nxt.workOrderComponentType
|
|
450
|
+
});
|
|
451
|
+
var _id = instance === null || instance === void 0 ? void 0 : instance.id;
|
|
452
|
+
var value = formValue[_id];
|
|
453
|
+
var _key = getKeyByValue(nxt.workOrderComponentType);
|
|
454
|
+
// TODO: 如果是订单号组件, 将值设置为orderNo
|
|
455
|
+
if (nxt.workOrderComponentType === 'TRADE_ID_INPUT') {
|
|
456
|
+
_key = 'orderNo';
|
|
457
|
+
}
|
|
458
|
+
if (_key) {
|
|
459
|
+
cur[_key] = value;
|
|
460
|
+
}
|
|
461
|
+
}
|
|
462
|
+
return cur;
|
|
463
|
+
}, {});
|
|
464
|
+
};
|
|
435
465
|
useEffect(function () {
|
|
436
|
-
if (isErpUse)
|
|
466
|
+
if (isErpUse && templateDetail) {
|
|
467
|
+
var formValue = form.getFieldsValue(true);
|
|
468
|
+
console.debug('表单内容值', formValue);
|
|
469
|
+
// TODO: 拼装需要重复提醒的组件数据格式
|
|
470
|
+
var value = repeatWarningDataSchema(formValue, templateDetail);
|
|
471
|
+
console.debug('重复提醒转换之后数据', value);
|
|
472
|
+
return orderBackReplace(value, templateDetail);
|
|
473
|
+
}
|
|
437
474
|
queryDetail({
|
|
438
475
|
workOrderId: workOrderId,
|
|
439
476
|
shopId: shopId,
|
|
@@ -443,7 +480,7 @@ var FormRender = function FormRender(props, ref) {
|
|
|
443
480
|
buyerId: buyerId,
|
|
444
481
|
buyerNick: buyerNick
|
|
445
482
|
});
|
|
446
|
-
}, [workOrderId, record, shopId, isErpUse]);
|
|
483
|
+
}, [workOrderId, record, shopId, isErpUse, templateDetail]);
|
|
447
484
|
|
|
448
485
|
// 重置映射隐藏的组件, 目前只有单选、下拉组件可能会因为映射关系隐藏
|
|
449
486
|
var resetMappdingHideComponents = function resetMappdingHideComponents() {
|
|
@@ -474,8 +511,8 @@ var FormRender = function FormRender(props, ref) {
|
|
|
474
511
|
|
|
475
512
|
// 批量映射
|
|
476
513
|
var batchFillByMapping = function batchFillByMapping(values) {
|
|
477
|
-
for (var
|
|
478
|
-
fillByMapping(
|
|
514
|
+
for (var _key2 in values) {
|
|
515
|
+
fillByMapping(_key2, values[_key2]);
|
|
479
516
|
}
|
|
480
517
|
};
|
|
481
518
|
// 组件映射
|
|
@@ -488,8 +525,8 @@ var FormRender = function FormRender(props, ref) {
|
|
|
488
525
|
form.setFieldsValue(mapping === null || mapping === void 0 ? void 0 : mapping[triggerValue]);
|
|
489
526
|
} else {
|
|
490
527
|
var resetSet = new Set();
|
|
491
|
-
for (var
|
|
492
|
-
for (var uniqueKey in mapping[
|
|
528
|
+
for (var _key3 in mapping) {
|
|
529
|
+
for (var uniqueKey in mapping[_key3]) {
|
|
493
530
|
resetSet.add(uniqueKey);
|
|
494
531
|
}
|
|
495
532
|
}
|
|
@@ -778,7 +815,15 @@ var FormRender = function FormRender(props, ref) {
|
|
|
778
815
|
componentCanShow = _getDisplayAndDisable.display;
|
|
779
816
|
// TODO: 非前置节点组件渲染消费是否可以编辑配置
|
|
780
817
|
if (!isPreRender) {
|
|
781
|
-
console.debug(
|
|
818
|
+
// console.debug(
|
|
819
|
+
// workOrderId ? '编辑状态:' : '新建状态:',
|
|
820
|
+
// name,
|
|
821
|
+
// '是否可以展示: ',
|
|
822
|
+
// componentCanShow,
|
|
823
|
+
// '是否可以编辑: ',
|
|
824
|
+
// !componentCanEdit,
|
|
825
|
+
// componentConfig?.status,
|
|
826
|
+
// );
|
|
782
827
|
newComponentConfig['disabled'] = componentCanEdit;
|
|
783
828
|
}
|
|
784
829
|
if (workOrderComponentType === 'ENTERPRISE_PAYMENT') {
|
|
@@ -8,9 +8,12 @@ interface NodeItem {
|
|
|
8
8
|
shopList: any[];
|
|
9
9
|
onOpenWangWang?: (nick: string, id: string) => void;
|
|
10
10
|
queryRemarkList: () => void;
|
|
11
|
+
openCloseCallback?: () => void;
|
|
11
12
|
handler: string;
|
|
12
13
|
canWithdraw: boolean;
|
|
13
14
|
readonly?: boolean;
|
|
15
|
+
visibleType?: string;
|
|
16
|
+
nodeIsAuto: boolean;
|
|
14
17
|
}
|
|
15
18
|
declare const NodeItem: (props: NodeItem) => React.JSX.Element;
|
|
16
19
|
export default NodeItem;
|
|
@@ -17,7 +17,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
|
|
|
17
17
|
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; }
|
|
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
|
-
import React, { useState, useMemo } from 'react';
|
|
20
|
+
import React, { useState, useMemo, useEffect } from 'react';
|
|
21
21
|
import { Form, message } from 'antd';
|
|
22
22
|
import { useRequest } from 'ahooks';
|
|
23
23
|
import { useSelector, useDispatch } from 'react-redux';
|
|
@@ -44,11 +44,15 @@ var NodeItem = function NodeItem(props) {
|
|
|
44
44
|
flowTemplateId = props.flowTemplateId,
|
|
45
45
|
shopList = props.shopList,
|
|
46
46
|
onOpenWangWang = props.onOpenWangWang,
|
|
47
|
+
openCloseCallback = props.openCloseCallback,
|
|
47
48
|
queryRemarkList = props.queryRemarkList,
|
|
48
49
|
handler = props.handler,
|
|
49
50
|
canWithdraw = props.canWithdraw,
|
|
50
51
|
_props$readonly = props.readonly,
|
|
51
|
-
readonly = _props$readonly === void 0 ? false : _props$readonly
|
|
52
|
+
readonly = _props$readonly === void 0 ? false : _props$readonly,
|
|
53
|
+
_props$visibleType = props.visibleType,
|
|
54
|
+
visibleType = _props$visibleType === void 0 ? '' : _props$visibleType,
|
|
55
|
+
nodeIsAuto = props.nodeIsAuto;
|
|
52
56
|
var dispatch = useDispatch();
|
|
53
57
|
var plat = useSelector(selectPlatInfo);
|
|
54
58
|
var operateParams = useSelector(selectOperateParams);
|
|
@@ -70,6 +74,14 @@ var NodeItem = function NodeItem(props) {
|
|
|
70
74
|
var _Form$useForm = Form.useForm(),
|
|
71
75
|
_Form$useForm2 = _slicedToArray(_Form$useForm, 1),
|
|
72
76
|
form = _Form$useForm2[0];
|
|
77
|
+
useEffect(function () {
|
|
78
|
+
//只展开非自动化任务
|
|
79
|
+
if (visibleType === 'open' && !nodeIsAuto) {
|
|
80
|
+
handleOpen();
|
|
81
|
+
} else if (visibleType === 'close') {
|
|
82
|
+
handlePackUp();
|
|
83
|
+
}
|
|
84
|
+
}, [visibleType]);
|
|
73
85
|
var _useRequest = useRequest(function () {
|
|
74
86
|
return queryNodeDetail({
|
|
75
87
|
nodeId: nodeId,
|
|
@@ -85,10 +97,11 @@ var NodeItem = function NodeItem(props) {
|
|
|
85
97
|
while (1) switch (_context.prev = _context.next) {
|
|
86
98
|
case 0:
|
|
87
99
|
if (!result.success) {
|
|
88
|
-
_context.next =
|
|
100
|
+
_context.next = 17;
|
|
89
101
|
break;
|
|
90
102
|
}
|
|
91
103
|
setOpen(true);
|
|
104
|
+
openCloseCallback === null || openCloseCallback === void 0 ? void 0 : openCloseCallback();
|
|
92
105
|
// 如果
|
|
93
106
|
currentNodeDetail = result === null || result === void 0 ? void 0 : result.data;
|
|
94
107
|
handlerList = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo === void 0 ? void 0 : _currentNodeDetail$wo.handlerList;
|
|
@@ -97,31 +110,31 @@ var NodeItem = function NodeItem(props) {
|
|
|
97
110
|
// 有处理人
|
|
98
111
|
!(assistants !== null && assistants !== void 0 && assistants.isAllStaff) // 不是所有人都能处理,查询能够处理的人
|
|
99
112
|
)) {
|
|
100
|
-
_context.next =
|
|
113
|
+
_context.next = 17;
|
|
101
114
|
break;
|
|
102
115
|
}
|
|
103
|
-
_context.prev =
|
|
104
|
-
_context.next =
|
|
116
|
+
_context.prev = 7;
|
|
117
|
+
_context.next = 10;
|
|
105
118
|
return queryMultiNodeAssistantInfo([{
|
|
106
119
|
flowTemplateId: flowTemplateId,
|
|
107
120
|
currentNodeId: nodeId
|
|
108
121
|
}]);
|
|
109
|
-
case
|
|
122
|
+
case 10:
|
|
110
123
|
assistantRes = _context.sent;
|
|
111
124
|
if (assistantRes.success) {
|
|
112
125
|
dispatch(setNodeAssistantInfo(_defineProperty({}, nodeId, ((_assistantRes$data = assistantRes.data) === null || _assistantRes$data === void 0 ? void 0 : _assistantRes$data.userList) || [])));
|
|
113
126
|
}
|
|
114
|
-
_context.next =
|
|
127
|
+
_context.next = 17;
|
|
115
128
|
break;
|
|
116
|
-
case
|
|
117
|
-
_context.prev =
|
|
118
|
-
_context.t0 = _context["catch"](
|
|
129
|
+
case 14:
|
|
130
|
+
_context.prev = 14;
|
|
131
|
+
_context.t0 = _context["catch"](7);
|
|
119
132
|
console.error(_context.t0);
|
|
120
|
-
case
|
|
133
|
+
case 17:
|
|
121
134
|
case "end":
|
|
122
135
|
return _context.stop();
|
|
123
136
|
}
|
|
124
|
-
}, _callee, null, [[
|
|
137
|
+
}, _callee, null, [[7, 14]]);
|
|
125
138
|
}));
|
|
126
139
|
function onSuccess(_x2) {
|
|
127
140
|
return _onSuccess.apply(this, arguments);
|
|
@@ -142,6 +155,7 @@ var NodeItem = function NodeItem(props) {
|
|
|
142
155
|
var handlePackUp = function handlePackUp() {
|
|
143
156
|
setOpen(false);
|
|
144
157
|
setEditing(false);
|
|
158
|
+
openCloseCallback === null || openCloseCallback === void 0 ? void 0 : openCloseCallback();
|
|
145
159
|
};
|
|
146
160
|
var handleSave = /*#__PURE__*/function () {
|
|
147
161
|
var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
|
|
@@ -41,7 +41,10 @@ var Record = function Record(props) {
|
|
|
41
41
|
}, /*#__PURE__*/React.createElement("span", null, time), /*#__PURE__*/React.createElement("span", {
|
|
42
42
|
className: styles.operator
|
|
43
43
|
}, operator), operatorType && /*#__PURE__*/React.createElement("span", {
|
|
44
|
-
className: styles.tag
|
|
44
|
+
className: styles.tag,
|
|
45
|
+
style: {
|
|
46
|
+
color: operatorType === 'REMARK' ? '#FF6600' : ''
|
|
47
|
+
}
|
|
45
48
|
}, getFlowOperate === null || getFlowOperate === void 0 ? void 0 : getFlowOperate[operatorType]))), /*#__PURE__*/React.createElement("div", null, "\u8282\u70B9\uFF1A", nodeName), /*#__PURE__*/React.createElement("div", {
|
|
46
49
|
className: styles.context
|
|
47
50
|
}, /*#__PURE__*/React.createElement("div", null, context), /*#__PURE__*/React.createElement("div", null, imgList === null || imgList === void 0 ? void 0 : imgList.map(function (item) {
|
|
@@ -22,7 +22,10 @@ var RemarkShow = function RemarkShow(props) {
|
|
|
22
22
|
}, /*#__PURE__*/React.createElement("span", null, time), /*#__PURE__*/React.createElement("span", {
|
|
23
23
|
className: styles.operator
|
|
24
24
|
}, operator), operatorType && /*#__PURE__*/React.createElement("span", {
|
|
25
|
-
className: styles.tag
|
|
25
|
+
className: styles.tag,
|
|
26
|
+
style: {
|
|
27
|
+
color: operatorType === 'REMARK' ? '#FF6600' : ''
|
|
28
|
+
}
|
|
26
29
|
}, getFlowOperate === null || getFlowOperate === void 0 ? void 0 : getFlowOperate[operatorType])), /*#__PURE__*/React.createElement("span", null, !readonly && /*#__PURE__*/React.createElement("span", {
|
|
27
30
|
className: styles.contextBtn,
|
|
28
31
|
onClick: handleOpenAddRemark
|
|
@@ -15,7 +15,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
|
|
|
15
15
|
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; } }
|
|
16
16
|
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
17
17
|
import React, { useEffect, useState, useRef, useMemo } from 'react';
|
|
18
|
-
import { Timeline, ConfigProvider, Form, message, Alert, Button, Spin } from 'antd';
|
|
18
|
+
import { Timeline, ConfigProvider, Form, message, Alert, Button, Spin, Row, Col } from 'antd';
|
|
19
19
|
import { get, find, isEmpty } from 'lodash';
|
|
20
20
|
import { useDispatch, useSelector, Provider, batch } from 'react-redux';
|
|
21
21
|
import store from "../model/store";
|
|
@@ -100,6 +100,10 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
100
100
|
_useState8 = _slicedToArray(_useState7, 2),
|
|
101
101
|
remindVisible = _useState8[0],
|
|
102
102
|
setRemindVisible = _useState8[1];
|
|
103
|
+
var _useState9 = useState(''),
|
|
104
|
+
_useState10 = _slicedToArray(_useState9, 2),
|
|
105
|
+
openCloseVisible = _useState10[0],
|
|
106
|
+
setOpenCloseVisible = _useState10[1];
|
|
103
107
|
var componentDtoList = (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo2 = currentNodeDetail.workOrderTemplateInfo) === null || _currentNodeDetail$wo2 === void 0 ? void 0 : _currentNodeDetail$wo2.componentDtoList) || [];
|
|
104
108
|
var tradeIdComponentDto = componentDtoList.find(function (item) {
|
|
105
109
|
return item.workOrderComponentType === 'TRADE_ID_INPUT';
|
|
@@ -479,7 +483,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
479
483
|
case 29:
|
|
480
484
|
return _context4.abrupt("return", callbackAutoSubmitResult({
|
|
481
485
|
success: false,
|
|
482
|
-
message: (_context4.t0 === null || _context4.t0 === void 0 ? void 0 : _context4.t0.message) ||
|
|
486
|
+
message: (_context4.t0 === null || _context4.t0 === void 0 ? void 0 : _context4.t0.message) || '接口请求异常'
|
|
483
487
|
}));
|
|
484
488
|
case 30:
|
|
485
489
|
if (get(_context4.t0, 'errorFields.length') > 0) {
|
|
@@ -978,11 +982,28 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
978
982
|
spinning: loading
|
|
979
983
|
}, /*#__PURE__*/React.createElement("div", {
|
|
980
984
|
className: "flowWorkOrderDetail"
|
|
981
|
-
}, flowStatus && /*#__PURE__*/React.createElement(
|
|
985
|
+
}, flowStatus && /*#__PURE__*/React.createElement(Row, {
|
|
986
|
+
justify: 'space-between'
|
|
987
|
+
}, /*#__PURE__*/React.createElement(Col, null, /*#__PURE__*/React.createElement("div", {
|
|
982
988
|
className: "header"
|
|
983
989
|
}, "\u6D41\u7A0B\u72B6\u6001\uFF1A", /*#__PURE__*/React.createElement("div", {
|
|
984
990
|
className: "status ".concat(flowStatus)
|
|
985
|
-
}), /*#__PURE__*/React.createElement("span", null, FLOW_STATUS_V2[flowStatus])), /*#__PURE__*/React.createElement(
|
|
991
|
+
}), /*#__PURE__*/React.createElement("span", null, FLOW_STATUS_V2[flowStatus]))), flowTemplateType !== 'SINGLE_PAGE' && /*#__PURE__*/React.createElement(Col, {
|
|
992
|
+
style: {
|
|
993
|
+
position: 'relative',
|
|
994
|
+
zIndex: 1
|
|
995
|
+
}
|
|
996
|
+
}, /*#__PURE__*/React.createElement("span", {
|
|
997
|
+
className: "context-btn",
|
|
998
|
+
onClick: function onClick() {
|
|
999
|
+
return setOpenCloseVisible('open');
|
|
1000
|
+
}
|
|
1001
|
+
}, "\u5C55\u5F00\u5168\u90E8"), "\uFF5C", /*#__PURE__*/React.createElement("span", {
|
|
1002
|
+
className: "context-btn",
|
|
1003
|
+
onClick: function onClick() {
|
|
1004
|
+
return setOpenCloseVisible('close');
|
|
1005
|
+
}
|
|
1006
|
+
}, "\u6536\u8D77\u5168\u90E8"))), /*#__PURE__*/React.createElement("div", {
|
|
986
1007
|
className: "center ".concat(flowStatus ? 'hasStatus' : '', " ").concat(readonly ? 'readonly' : '')
|
|
987
1008
|
}, currentTradeIdLinkWorkOrderId.total > 0 && /*#__PURE__*/React.createElement("div", {
|
|
988
1009
|
className: "alertRepeatTradeId"
|
|
@@ -1007,7 +1028,12 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
1007
1028
|
queryRemarkList: queryRemarkList,
|
|
1008
1029
|
handler: flowRecord.operator,
|
|
1009
1030
|
canWithdraw: canWithdraw,
|
|
1010
|
-
readonly: readonly
|
|
1031
|
+
readonly: readonly,
|
|
1032
|
+
visibleType: openCloseVisible,
|
|
1033
|
+
nodeIsAuto: flowRecord.nodeIsAuto,
|
|
1034
|
+
openCloseCallback: function openCloseCallback() {
|
|
1035
|
+
setOpenCloseVisible('');
|
|
1036
|
+
}
|
|
1011
1037
|
}));
|
|
1012
1038
|
}), currentNodeDetail && /*#__PURE__*/React.createElement(Timeline.Item, null, /*#__PURE__*/React.createElement(CurrentNode, {
|
|
1013
1039
|
ref: currentNodeRef,
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import React from 'react';
|
|
2
|
+
import type { OrderDrawerRefObject, WDTVersionType } from '../interface';
|
|
3
|
+
declare type OrderDrawerPropsType = {
|
|
4
|
+
version: WDTVersionType;
|
|
5
|
+
};
|
|
6
|
+
declare const _default: React.ForwardRefExoticComponent<OrderDrawerPropsType & React.RefAttributes<OrderDrawerRefObject>>;
|
|
7
|
+
export default _default;
|
|
@@ -0,0 +1,79 @@
|
|
|
1
|
+
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
|
|
2
|
+
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."); }
|
|
3
|
+
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); }
|
|
4
|
+
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; }
|
|
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; } }
|
|
6
|
+
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
7
|
+
import React, { useState, forwardRef, useImperativeHandle, useRef } from 'react';
|
|
8
|
+
import { Drawer, Button } from 'antd';
|
|
9
|
+
import OrderForm from "./OrderForm/index";
|
|
10
|
+
var OrderDrawer = function OrderDrawer(props, ref) {
|
|
11
|
+
var version = props.version;
|
|
12
|
+
var _useState = useState(false),
|
|
13
|
+
_useState2 = _slicedToArray(_useState, 2),
|
|
14
|
+
open = _useState2[0],
|
|
15
|
+
setOpen = _useState2[1];
|
|
16
|
+
var _useState3 = useState(),
|
|
17
|
+
_useState4 = _slicedToArray(_useState3, 2),
|
|
18
|
+
type = _useState4[0],
|
|
19
|
+
setType = _useState4[1];
|
|
20
|
+
var _useState5 = useState(null),
|
|
21
|
+
_useState6 = _slicedToArray(_useState5, 2),
|
|
22
|
+
trade = _useState6[0],
|
|
23
|
+
setTrade = _useState6[1];
|
|
24
|
+
var _useState7 = useState([]),
|
|
25
|
+
_useState8 = _slicedToArray(_useState7, 2),
|
|
26
|
+
tradeList = _useState8[0],
|
|
27
|
+
setTradeList = _useState8[1];
|
|
28
|
+
var orderFormRef = useRef(null);
|
|
29
|
+
useImperativeHandle(ref, function () {
|
|
30
|
+
return {
|
|
31
|
+
open: function open(params) {
|
|
32
|
+
var type = params.type,
|
|
33
|
+
trade = params.trade,
|
|
34
|
+
tradeList = params.tradeList;
|
|
35
|
+
setType(type);
|
|
36
|
+
setTrade(trade);
|
|
37
|
+
setTradeList(tradeList);
|
|
38
|
+
setOpen(true);
|
|
39
|
+
}
|
|
40
|
+
};
|
|
41
|
+
});
|
|
42
|
+
var onClose = function onClose() {
|
|
43
|
+
setOpen(false);
|
|
44
|
+
};
|
|
45
|
+
var onConfirm = function onConfirm() {
|
|
46
|
+
var _orderFormRef$current;
|
|
47
|
+
(_orderFormRef$current = orderFormRef.current) === null || _orderFormRef$current === void 0 ? void 0 : _orderFormRef$current.submit();
|
|
48
|
+
};
|
|
49
|
+
return /*#__PURE__*/React.createElement(Drawer, {
|
|
50
|
+
title: "\u65B0\u5EFA\u5355\u636E",
|
|
51
|
+
placement: "right",
|
|
52
|
+
closable: false,
|
|
53
|
+
visible: open,
|
|
54
|
+
onClose: onClose,
|
|
55
|
+
width: "100%",
|
|
56
|
+
footer: /*#__PURE__*/React.createElement("div", {
|
|
57
|
+
className: "btns",
|
|
58
|
+
style: {
|
|
59
|
+
float: 'right'
|
|
60
|
+
}
|
|
61
|
+
}, /*#__PURE__*/React.createElement(Button, {
|
|
62
|
+
style: {
|
|
63
|
+
marginRight: '10px'
|
|
64
|
+
},
|
|
65
|
+
onClick: onClose
|
|
66
|
+
}, "\u53D6\u6D88"), /*#__PURE__*/React.createElement(Button, {
|
|
67
|
+
type: "primary",
|
|
68
|
+
onClick: onConfirm
|
|
69
|
+
}, "\u4FDD\u5B58"))
|
|
70
|
+
}, open && trade && /*#__PURE__*/React.createElement(OrderForm, {
|
|
71
|
+
version: version,
|
|
72
|
+
trade: trade,
|
|
73
|
+
tradeList: tradeList,
|
|
74
|
+
type: type,
|
|
75
|
+
ref: orderFormRef,
|
|
76
|
+
onCreate: onClose
|
|
77
|
+
}));
|
|
78
|
+
};
|
|
79
|
+
export default /*#__PURE__*/forwardRef(OrderDrawer);
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import React from 'react';
|
|
2
|
+
import type { WdtTrade, OrderFormItemsRefObject, WDTVersionType } from '../../interface';
|
|
3
|
+
import type { FormInstance } from 'antd';
|
|
4
|
+
declare type ReissueItemsProps = {
|
|
5
|
+
trade: WdtTrade.TradeInfo;
|
|
6
|
+
tradeList: WdtTrade.TradeInfo[];
|
|
7
|
+
form: FormInstance;
|
|
8
|
+
version: WDTVersionType;
|
|
9
|
+
};
|
|
10
|
+
declare const _default: React.ForwardRefExoticComponent<ReissueItemsProps & React.RefAttributes<OrderFormItemsRefObject>>;
|
|
11
|
+
export default _default;
|
|
@@ -0,0 +1,178 @@
|
|
|
1
|
+
import React, { useImperativeHandle, forwardRef } from 'react';
|
|
2
|
+
import { Form, Input, Radio, InputNumber } from 'antd';
|
|
3
|
+
import { WdtAddressData } from '@kmkf-fe-packages/kmkf-utils';
|
|
4
|
+
import Address from "../fields/Address";
|
|
5
|
+
import LogisticsCode from "../fields/LogisticsCode";
|
|
6
|
+
import Warehouse from "../fields/Warehouse";
|
|
7
|
+
import Goods from "../fields/Goods";
|
|
8
|
+
import { createWdtReissueOrder } from "../../../model/servers/api";
|
|
9
|
+
import { cloneDeep } from 'lodash';
|
|
10
|
+
var ReissueItems = function ReissueItems(props, ref) {
|
|
11
|
+
var trade = props.trade,
|
|
12
|
+
tradeList = props.tradeList,
|
|
13
|
+
form = props.form,
|
|
14
|
+
version = props.version;
|
|
15
|
+
var addressType = Form.useWatch('addressType', form);
|
|
16
|
+
useImperativeHandle(ref, function () {
|
|
17
|
+
return {
|
|
18
|
+
submit: function submit(params) {
|
|
19
|
+
var onCreate = params.onCreate,
|
|
20
|
+
data = params.data;
|
|
21
|
+
var submitData = cloneDeep(data);
|
|
22
|
+
if (submitData.address) {
|
|
23
|
+
submitData.receiverProvince = submitData.address.address[0];
|
|
24
|
+
submitData.receiverCity = submitData.address.address[1];
|
|
25
|
+
submitData.receiverDistrict = submitData.address.address[2];
|
|
26
|
+
submitData.receiverAddress = submitData.address.detail;
|
|
27
|
+
delete submitData.address;
|
|
28
|
+
}
|
|
29
|
+
// if (submitData.warehouse) {
|
|
30
|
+
// submitData.sendId = submitData.warehouse.value;
|
|
31
|
+
// submitData.sendName = submitData.warehouse.label;
|
|
32
|
+
// delete submitData.warehouse;
|
|
33
|
+
// }
|
|
34
|
+
if (submitData.tradeDetail) {
|
|
35
|
+
submitData.tradeNo = submitData.tradeDetail.sid;
|
|
36
|
+
submitData.specList = submitData.tradeDetail.specList;
|
|
37
|
+
delete submitData.tradeDetail;
|
|
38
|
+
}
|
|
39
|
+
delete submitData.afterSaleType;
|
|
40
|
+
createWdtReissueOrder(submitData).then(function () {
|
|
41
|
+
onCreate === null || onCreate === void 0 ? void 0 : onCreate();
|
|
42
|
+
}).catch(console.log);
|
|
43
|
+
}
|
|
44
|
+
};
|
|
45
|
+
});
|
|
46
|
+
React.useEffect(function () {
|
|
47
|
+
WdtAddressData.initData().then(function (wdt) {
|
|
48
|
+
var _trade$extends;
|
|
49
|
+
var formDefaultData = {
|
|
50
|
+
address: {
|
|
51
|
+
address: [wdt.getProCodeByName(trade.receiverState), wdt.getProCodeByName(trade.receiverCity), wdt.getProCodeByName(trade.receiverDistrict)],
|
|
52
|
+
detail: trade.receiverAddress
|
|
53
|
+
},
|
|
54
|
+
buyerMessage: trade.buyerMessage,
|
|
55
|
+
buyerNick: (_trade$extends = trade.extends) === null || _trade$extends === void 0 ? void 0 : _trade$extends.buyer_nick,
|
|
56
|
+
receiverMobile: trade.receiverMobile,
|
|
57
|
+
receiverName: trade.receiverName,
|
|
58
|
+
csRemark: trade.sellerMemo,
|
|
59
|
+
tradeDetail: {
|
|
60
|
+
// sid: 'JY202401176859', // 旗舰版订单号
|
|
61
|
+
// sid: 'JY2024010116985', // 企业版 快力文订单号
|
|
62
|
+
sid: 'JY2024012813517',
|
|
63
|
+
// 企业版 邹三和订单号
|
|
64
|
+
// sid: trade.sid,
|
|
65
|
+
type: 'original',
|
|
66
|
+
specList: trade.orders.map(function (order) {
|
|
67
|
+
return {
|
|
68
|
+
num: order.num,
|
|
69
|
+
price: order.payment,
|
|
70
|
+
goodsId: 'TODO: 补全货品id',
|
|
71
|
+
specNo: order.sysSkuOuterId,
|
|
72
|
+
goodsName: order.title,
|
|
73
|
+
imgUrl: order.sysPicPath,
|
|
74
|
+
specName: order.sysSkuPropertiesName
|
|
75
|
+
};
|
|
76
|
+
})
|
|
77
|
+
},
|
|
78
|
+
addressType: 'original',
|
|
79
|
+
tradeType: '补发单',
|
|
80
|
+
// TODO: 反填带入数据
|
|
81
|
+
logisticsCode: '8',
|
|
82
|
+
warehouseNo: '07'
|
|
83
|
+
};
|
|
84
|
+
form.setFieldsValue(formDefaultData);
|
|
85
|
+
});
|
|
86
|
+
}, []);
|
|
87
|
+
return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Form.Item, {
|
|
88
|
+
label: "\u8865\u53D1\u5730\u5740\u7C7B\u578B",
|
|
89
|
+
name: "addressType",
|
|
90
|
+
rules: [{
|
|
91
|
+
required: true,
|
|
92
|
+
message: '请选择补发地址类型'
|
|
93
|
+
}]
|
|
94
|
+
}, /*#__PURE__*/React.createElement(Radio.Group, {
|
|
95
|
+
options: [{
|
|
96
|
+
label: '原地址补发',
|
|
97
|
+
value: 'original'
|
|
98
|
+
}, {
|
|
99
|
+
label: '非原地址补发',
|
|
100
|
+
value: 'custom'
|
|
101
|
+
}]
|
|
102
|
+
})), addressType === 'custom' && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Form.Item, {
|
|
103
|
+
label: "\u6536\u8D27\u4EBA\u540D\u5B57",
|
|
104
|
+
name: "receiverName",
|
|
105
|
+
rules: [{
|
|
106
|
+
required: true,
|
|
107
|
+
message: '请填写名字'
|
|
108
|
+
}]
|
|
109
|
+
}, /*#__PURE__*/React.createElement(Input, null)), /*#__PURE__*/React.createElement(Form.Item, {
|
|
110
|
+
label: "\u6536\u8D27\u4EBA\u7535\u8BDD",
|
|
111
|
+
name: "receiverMobile",
|
|
112
|
+
rules: [{
|
|
113
|
+
required: true,
|
|
114
|
+
message: '请填写手机号'
|
|
115
|
+
}]
|
|
116
|
+
}, /*#__PURE__*/React.createElement(Input, null)), /*#__PURE__*/React.createElement(Form.Item, {
|
|
117
|
+
label: "\u6536\u8D27\u5730\u5740",
|
|
118
|
+
name: "address",
|
|
119
|
+
rules: [{
|
|
120
|
+
required: true,
|
|
121
|
+
validator: function validator(_, value) {
|
|
122
|
+
if (!value || !value.detail || !value.address.length) {
|
|
123
|
+
return Promise.reject(new Error('请填写收货地址'));
|
|
124
|
+
} else if (value.address.some(function (v) {
|
|
125
|
+
return !v;
|
|
126
|
+
})) {
|
|
127
|
+
return Promise.reject(new Error('请选择完整的省市区信息'));
|
|
128
|
+
}
|
|
129
|
+
return Promise.resolve();
|
|
130
|
+
}
|
|
131
|
+
}]
|
|
132
|
+
}, /*#__PURE__*/React.createElement(Address, null))), version === 'flagship' && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Form.Item, {
|
|
133
|
+
label: "\u8BA2\u5355\u7C7B\u578B",
|
|
134
|
+
name: "tradeType"
|
|
135
|
+
}, /*#__PURE__*/React.createElement(Input, null)), /*#__PURE__*/React.createElement(Form.Item, {
|
|
136
|
+
label: "\u672C\u6B21\u6536\u6B3E",
|
|
137
|
+
name: "directPaid"
|
|
138
|
+
}, /*#__PURE__*/React.createElement(InputNumber, {
|
|
139
|
+
style: {
|
|
140
|
+
width: '100%'
|
|
141
|
+
},
|
|
142
|
+
precision: 2
|
|
143
|
+
}))), /*#__PURE__*/React.createElement(Form.Item, {
|
|
144
|
+
label: "\u53D1\u8D27\u4ED3\u5E93",
|
|
145
|
+
name: "warehouseNo"
|
|
146
|
+
}, /*#__PURE__*/React.createElement(Warehouse, null)), /*#__PURE__*/React.createElement(Form.Item, {
|
|
147
|
+
label: "\u53D1\u8D27\u5FEB\u9012",
|
|
148
|
+
name: "logisticsCode"
|
|
149
|
+
}, /*#__PURE__*/React.createElement(LogisticsCode, null)), /*#__PURE__*/React.createElement(Form.Item, {
|
|
150
|
+
label: "\u5BA2\u670D\u5907\u6CE8",
|
|
151
|
+
name: "csRemark"
|
|
152
|
+
}, /*#__PURE__*/React.createElement(Input, null)), /*#__PURE__*/React.createElement(Form.Item, {
|
|
153
|
+
label: "\u4E70\u5BB6\u5907\u6CE8",
|
|
154
|
+
name: "buyerMessage"
|
|
155
|
+
}, /*#__PURE__*/React.createElement(Input, null)), /*#__PURE__*/React.createElement(Form.Item, {
|
|
156
|
+
name: "tradeDetail",
|
|
157
|
+
labelCol: {
|
|
158
|
+
style: {
|
|
159
|
+
display: 'none'
|
|
160
|
+
}
|
|
161
|
+
},
|
|
162
|
+
rules: [{
|
|
163
|
+
validator: function validator(_, value) {
|
|
164
|
+
var _value$specList;
|
|
165
|
+
if (!value.sid) {
|
|
166
|
+
return Promise.reject(new Error('请选择补发系统订单号'));
|
|
167
|
+
} else if (!(value !== null && value !== void 0 && (_value$specList = value.specList) !== null && _value$specList !== void 0 && _value$specList.length)) {
|
|
168
|
+
return Promise.reject(new Error('请选择补发商品'));
|
|
169
|
+
}
|
|
170
|
+
return Promise.resolve();
|
|
171
|
+
}
|
|
172
|
+
}]
|
|
173
|
+
}, /*#__PURE__*/React.createElement(Goods, {
|
|
174
|
+
trade: trade,
|
|
175
|
+
tradeList: tradeList
|
|
176
|
+
})));
|
|
177
|
+
};
|
|
178
|
+
export default /*#__PURE__*/forwardRef(ReissueItems);
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import React from 'react';
|
|
2
|
+
import type { OrderFormRefObject, WdtTrade, AfterSaleTypeType, WDTVersionType } from '../../interface';
|
|
3
|
+
declare type OrderFormPropsType = {
|
|
4
|
+
trade: WdtTrade.TradeInfo;
|
|
5
|
+
tradeList: WdtTrade.TradeInfo[];
|
|
6
|
+
type?: AfterSaleTypeType;
|
|
7
|
+
version: WDTVersionType;
|
|
8
|
+
onCreate?: () => void;
|
|
9
|
+
};
|
|
10
|
+
declare const _default: React.ForwardRefExoticComponent<OrderFormPropsType & React.RefAttributes<OrderFormRefObject>>;
|
|
11
|
+
export default _default;
|