@kmkf-fe-packages/kmkf-work-order-service-component 0.27.0 → 0.27.1-test.11
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/ActionList/index.js +12 -13
- package/dist/esm/FlowTemplateDetail/components/CurrentNode/index.d.ts +1 -0
- package/dist/esm/FlowTemplateDetail/components/CurrentNode/index.js +4 -2
- package/dist/esm/FlowTemplateDetail/components/FormRender/index.d.ts +2 -0
- package/dist/esm/FlowTemplateDetail/components/FormRender/index.js +20 -4
- package/dist/esm/FlowTemplateDetail/components/PreNodeRender/index.js +4 -1
- package/dist/esm/FlowTemplateDetail/components/RemarkShow/index.d.ts +1 -0
- package/dist/esm/FlowTemplateDetail/components/RemarkShow/index.js +4 -2
- package/dist/esm/FlowTemplateDetail/index.d.ts +5 -0
- package/dist/esm/FlowTemplateDetail/index.js +68 -25
- 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/PaymentWorkOrderList/components/PaymentWorkOrderCard/index.js +20 -5
- package/dist/esm/WorkOrder/index.js +25 -2
- package/dist/esm/common/utils/tools.js +97 -81
- package/dist/esm/index.d.ts +2 -0
- package/dist/esm/index.js +2 -0
- package/dist/esm/model/flowTemplateDetail/api.d.ts +1 -1
- package/dist/esm/model/flowTemplateDetail/api.js +3 -1
- 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
|
@@ -1,13 +1,13 @@
|
|
|
1
|
-
import React from 'react';
|
|
1
|
+
import React, { useMemo } from 'react';
|
|
2
2
|
import { Menu, Button, Space, Dropdown } from 'antd';
|
|
3
3
|
import { DownOutlined } from '@ant-design/icons';
|
|
4
4
|
import { FlowStatus, FlowType } from "../../../model/flowTemplateDetail/types";
|
|
5
5
|
import styles from "./index.module.less";
|
|
6
|
-
var getActionMap = function getActionMap(nodeStatus, hasPreNode) {
|
|
6
|
+
var getActionMap = function getActionMap(nodeStatus, hasPreNode, flowType) {
|
|
7
7
|
// 非开始节点看状态
|
|
8
8
|
if (nodeStatus === FlowStatus.PROCESSING) {
|
|
9
9
|
if (hasPreNode) return ['forward', 'save', 'submit', 'rejected', 'close', 'stop'];
|
|
10
|
-
return ['forward', 'save', 'submit', 'close', 'stop'];
|
|
10
|
+
return flowType === FlowType.SINGLE_PAGE ? ['save', 'forward', 'close', 'stop', 'submit'] : ['forward', 'save', 'submit', 'close', 'stop'];
|
|
11
11
|
} else if (nodeStatus === FlowStatus.STOPPING) {
|
|
12
12
|
return ['open', 'close'];
|
|
13
13
|
} else if (nodeStatus === FlowStatus.CLOSE || nodeStatus === FlowStatus.COMPLETED) {
|
|
@@ -19,12 +19,8 @@ var getActionMap = function getActionMap(nodeStatus, hasPreNode) {
|
|
|
19
19
|
var buttonMap = function buttonMap(flowType) {
|
|
20
20
|
return {
|
|
21
21
|
save: {
|
|
22
|
-
label: '暂存',
|
|
23
|
-
type: 'default'
|
|
24
|
-
style: {
|
|
25
|
-
backgroundColor: flowType === FlowType.SINGLE_PAGE ? '#52c41a' : '',
|
|
26
|
-
color: flowType === FlowType.SINGLE_PAGE ? '#fff' : '#000'
|
|
27
|
-
}
|
|
22
|
+
label: flowType === FlowType.SINGLE_PAGE ? '保存' : '暂存',
|
|
23
|
+
type: flowType === FlowType.SINGLE_PAGE ? 'primary' : 'default'
|
|
28
24
|
},
|
|
29
25
|
submit: {
|
|
30
26
|
label: flowType === FlowType.SINGLE_PAGE ? '完结' : '提交',
|
|
@@ -60,7 +56,10 @@ var ActionList = function ActionList(props) {
|
|
|
60
56
|
_props$flowType = props.flowType,
|
|
61
57
|
flowType = _props$flowType === void 0 ? FlowType.SINGLE_PAGE : _props$flowType,
|
|
62
58
|
handleAction = props.handleAction;
|
|
63
|
-
var buttonList = getActionMap(flowStatus, hasPreNode);
|
|
59
|
+
var buttonList = getActionMap(flowStatus, hasPreNode, flowType);
|
|
60
|
+
var sliceLen = useMemo(function () {
|
|
61
|
+
return flowType === FlowType.SINGLE_PAGE ? 1 : 3;
|
|
62
|
+
}, [flowType]);
|
|
64
63
|
var menu = function menu(list) {
|
|
65
64
|
var items = list.map(function (item, index) {
|
|
66
65
|
return {
|
|
@@ -81,13 +80,13 @@ var ActionList = function ActionList(props) {
|
|
|
81
80
|
};
|
|
82
81
|
return /*#__PURE__*/React.createElement("div", {
|
|
83
82
|
className: styles.wrap
|
|
84
|
-
}, /*#__PURE__*/React.createElement(Space, null, buttonList.slice(
|
|
85
|
-
overlay: menu(buttonList.slice(
|
|
83
|
+
}, /*#__PURE__*/React.createElement(Space, null, buttonList.slice(sliceLen).length > 0 && /*#__PURE__*/React.createElement(Dropdown, {
|
|
84
|
+
overlay: menu(buttonList.slice(sliceLen))
|
|
86
85
|
}, /*#__PURE__*/React.createElement(Button, {
|
|
87
86
|
onClick: function onClick(e) {
|
|
88
87
|
return e.preventDefault();
|
|
89
88
|
}
|
|
90
|
-
}, /*#__PURE__*/React.createElement(Space, null, "\u66F4\u591A", /*#__PURE__*/React.createElement(DownOutlined, null)))), (_buttonList$slice = buttonList.slice(0,
|
|
89
|
+
}, /*#__PURE__*/React.createElement(Space, null, "\u66F4\u591A", /*#__PURE__*/React.createElement(DownOutlined, null)))), (_buttonList$slice = buttonList.slice(0, sliceLen)) === null || _buttonList$slice === void 0 ? void 0 : _buttonList$slice.map(function (button, index) {
|
|
91
90
|
var _buttonMap$button, _buttonMap$button2, _buttonMap$button3, _buttonMap$button4;
|
|
92
91
|
return /*#__PURE__*/React.createElement(Button, {
|
|
93
92
|
key: "button".concat(index),
|
|
@@ -11,6 +11,7 @@ declare type CurrentNodeProps = {
|
|
|
11
11
|
flowTemplateId: string;
|
|
12
12
|
flowWorkOrderId?: string;
|
|
13
13
|
queryRemarkList: () => void;
|
|
14
|
+
autoSubmit?: boolean;
|
|
14
15
|
};
|
|
15
16
|
declare const _default: React.ForwardRefExoticComponent<CurrentNodeProps & React.RefAttributes<unknown>>;
|
|
16
17
|
export default _default;
|
|
@@ -53,7 +53,8 @@ var CurrentNode = function CurrentNode(props, ref) {
|
|
|
53
53
|
readonly = _props$readonly === void 0 ? false : _props$readonly,
|
|
54
54
|
flowTemplateId = props.flowTemplateId,
|
|
55
55
|
flowWorkOrderId = props.flowWorkOrderId,
|
|
56
|
-
queryRemarkList = props.queryRemarkList
|
|
56
|
+
queryRemarkList = props.queryRemarkList,
|
|
57
|
+
autoSubmit = props.autoSubmit;
|
|
57
58
|
var dispatch = useDispatch();
|
|
58
59
|
// 是否是编辑状态
|
|
59
60
|
var _useState = useState(false),
|
|
@@ -256,7 +257,8 @@ var CurrentNode = function CurrentNode(props, ref) {
|
|
|
256
257
|
handleChangeTradeId: handleChangeTradeId,
|
|
257
258
|
canModifyPayment: true,
|
|
258
259
|
flowAllShowHideRules: allShowHideRules,
|
|
259
|
-
firstOrderBackfill: flowStatus !== FlowStatus.COMPLETED
|
|
260
|
+
firstOrderBackfill: flowStatus !== FlowStatus.COMPLETED,
|
|
261
|
+
autoSubmit: autoSubmit
|
|
260
262
|
}))));
|
|
261
263
|
};
|
|
262
264
|
export default /*#__PURE__*/forwardRef(CurrentNode);
|
|
@@ -29,6 +29,8 @@ declare type FormRenderProps = {
|
|
|
29
29
|
canModifyPayment?: boolean;
|
|
30
30
|
flowAllShowHideRules?: CurrentFlowShowHideRules;
|
|
31
31
|
firstOrderBackfill?: boolean;
|
|
32
|
+
isErpUse?: boolean;
|
|
33
|
+
autoSubmit?: boolean;
|
|
32
34
|
};
|
|
33
35
|
declare const _default: React.ForwardRefExoticComponent<FormRenderProps & React.RefAttributes<unknown>>;
|
|
34
36
|
export default _default;
|
|
@@ -70,7 +70,11 @@ var FormRender = function FormRender(props, ref) {
|
|
|
70
70
|
currentNodeTid = props.currentNodeTid,
|
|
71
71
|
onUpdateRemark = props.onUpdateRemark,
|
|
72
72
|
_props$firstOrderBack = props.firstOrderBackfill,
|
|
73
|
-
firstOrderBackfill = _props$firstOrderBack === void 0 ? true : _props$firstOrderBack
|
|
73
|
+
firstOrderBackfill = _props$firstOrderBack === void 0 ? true : _props$firstOrderBack,
|
|
74
|
+
_props$isErpUse = props.isErpUse,
|
|
75
|
+
isErpUse = _props$isErpUse === void 0 ? false : _props$isErpUse,
|
|
76
|
+
_props$autoSubmit = props.autoSubmit,
|
|
77
|
+
autoSubmit = _props$autoSubmit === void 0 ? false : _props$autoSubmit;
|
|
74
78
|
var shopIdKeyMap = useMemo(function () {
|
|
75
79
|
var json = {};
|
|
76
80
|
shopList.forEach(function (shop) {
|
|
@@ -231,6 +235,8 @@ var FormRender = function FormRender(props, ref) {
|
|
|
231
235
|
|
|
232
236
|
// 更新备注
|
|
233
237
|
var fetchRemark = function fetchRemark(shopId, orderNo) {
|
|
238
|
+
// TODO: 自动提交模式下不处理备注
|
|
239
|
+
if (autoSubmit) return;
|
|
234
240
|
if (!onUpdateRemark) return;
|
|
235
241
|
if (!shopId || !orderNo) {
|
|
236
242
|
onUpdateRemark('', '');
|
|
@@ -427,6 +433,7 @@ var FormRender = function FormRender(props, ref) {
|
|
|
427
433
|
resetMappdingHideComponents();
|
|
428
434
|
};
|
|
429
435
|
useEffect(function () {
|
|
436
|
+
if (isErpUse) return;
|
|
430
437
|
queryDetail({
|
|
431
438
|
workOrderId: workOrderId,
|
|
432
439
|
shopId: shopId,
|
|
@@ -436,7 +443,7 @@ var FormRender = function FormRender(props, ref) {
|
|
|
436
443
|
buyerId: buyerId,
|
|
437
444
|
buyerNick: buyerNick
|
|
438
445
|
});
|
|
439
|
-
}, [workOrderId, record, shopId]);
|
|
446
|
+
}, [workOrderId, record, shopId, isErpUse]);
|
|
440
447
|
|
|
441
448
|
// 重置映射隐藏的组件, 目前只有单选、下拉组件可能会因为映射关系隐藏
|
|
442
449
|
var resetMappdingHideComponents = function resetMappdingHideComponents() {
|
|
@@ -590,7 +597,8 @@ var FormRender = function FormRender(props, ref) {
|
|
|
590
597
|
return _context2.abrupt("return");
|
|
591
598
|
case 4:
|
|
592
599
|
queryReplaceCount(_defineProperty({}, type, value), templateDetail);
|
|
593
|
-
|
|
600
|
+
// TODO: ERP不走订单反弹逻辑
|
|
601
|
+
if ((type === 'tradeId' || type === 'enterprisePaymentTid') && !isErpUse) {
|
|
594
602
|
changeHandle(value);
|
|
595
603
|
}
|
|
596
604
|
case 6:
|
|
@@ -770,7 +778,15 @@ var FormRender = function FormRender(props, ref) {
|
|
|
770
778
|
componentCanShow = _getDisplayAndDisable.display;
|
|
771
779
|
// TODO: 非前置节点组件渲染消费是否可以编辑配置
|
|
772
780
|
if (!isPreRender) {
|
|
773
|
-
console.debug(
|
|
781
|
+
// console.debug(
|
|
782
|
+
// workOrderId ? '编辑状态:' : '新建状态:',
|
|
783
|
+
// name,
|
|
784
|
+
// '是否可以展示: ',
|
|
785
|
+
// componentCanShow,
|
|
786
|
+
// '是否可以编辑: ',
|
|
787
|
+
// !componentCanEdit,
|
|
788
|
+
// componentConfig?.status,
|
|
789
|
+
// );
|
|
774
790
|
newComponentConfig['disabled'] = componentCanEdit;
|
|
775
791
|
}
|
|
776
792
|
if (workOrderComponentType === 'ENTERPRISE_PAYMENT') {
|
|
@@ -13,7 +13,10 @@ var PreNodeRender = function PreNodeRender(props) {
|
|
|
13
13
|
id: t.uniqueKey,
|
|
14
14
|
name: t.name,
|
|
15
15
|
componentConfig: t.componentConfig,
|
|
16
|
-
type: t.workOrderComponentType
|
|
16
|
+
type: t.workOrderComponentType,
|
|
17
|
+
effects: {
|
|
18
|
+
env: platform
|
|
19
|
+
}
|
|
17
20
|
});
|
|
18
21
|
// 淘宝端的买家昵称是需要亮灯展示的
|
|
19
22
|
if (platform === PlatForm.TB && ['ENTERPRISE_PAYMENT', 'BUYER_NICK_INPUT'].includes(t.workOrderComponentType)) {
|
|
@@ -10,7 +10,9 @@ var RemarkShow = function RemarkShow(props) {
|
|
|
10
10
|
operatorType = props.operatorType,
|
|
11
11
|
handleOpenRemarkList = props.handleOpenRemarkList,
|
|
12
12
|
handleOpenAddRemark = props.handleOpenAddRemark,
|
|
13
|
-
imgList = props.imgList
|
|
13
|
+
imgList = props.imgList,
|
|
14
|
+
_props$readonly = props.readonly,
|
|
15
|
+
readonly = _props$readonly === void 0 ? false : _props$readonly;
|
|
14
16
|
return /*#__PURE__*/React.createElement("div", {
|
|
15
17
|
className: styles.remarkContext
|
|
16
18
|
}, /*#__PURE__*/React.createElement("div", {
|
|
@@ -21,7 +23,7 @@ var RemarkShow = function RemarkShow(props) {
|
|
|
21
23
|
className: styles.operator
|
|
22
24
|
}, operator), operatorType && /*#__PURE__*/React.createElement("span", {
|
|
23
25
|
className: styles.tag
|
|
24
|
-
}, getFlowOperate === null || getFlowOperate === void 0 ? void 0 : getFlowOperate[operatorType])), /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("span", {
|
|
26
|
+
}, getFlowOperate === null || getFlowOperate === void 0 ? void 0 : getFlowOperate[operatorType])), /*#__PURE__*/React.createElement("span", null, !readonly && /*#__PURE__*/React.createElement("span", {
|
|
25
27
|
className: styles.contextBtn,
|
|
26
28
|
onClick: handleOpenAddRemark
|
|
27
29
|
}, "\u5907\u6CE8"), /*#__PURE__*/React.createElement("span", {
|
|
@@ -14,6 +14,11 @@ declare type FlowTemplateDetailProps = {
|
|
|
14
14
|
tid: string;
|
|
15
15
|
shopId: string;
|
|
16
16
|
}) => void;
|
|
17
|
+
autoSubmit?: boolean;
|
|
18
|
+
callbackAutoSubmitResult?: (result: {
|
|
19
|
+
success: boolean;
|
|
20
|
+
message?: string;
|
|
21
|
+
}) => void;
|
|
17
22
|
};
|
|
18
23
|
declare const ProviderWrap: (props: FlowTemplateDetailProps) => React.JSX.Element;
|
|
19
24
|
export default ProviderWrap;
|
|
@@ -43,6 +43,7 @@ import { saveWorkOrder, submitWorkOrder, addRemark, stopWorkOrder, closeWorkOrde
|
|
|
43
43
|
import { orderDetail } from "../model/servers/api";
|
|
44
44
|
import cache from "../common/cache";
|
|
45
45
|
import "./index.less";
|
|
46
|
+
import { isNull } from '@kmkf-fe-packages/kmkf-utils';
|
|
46
47
|
var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
47
48
|
var _currentNodeDetail$wo, _currentNodeDetail$no, _currentNodeDetail$wo2, _shopList$find, _currentNodeDetail$no21, _currentNodeDetail$no22, _currentNodeDetail$no23;
|
|
48
49
|
var flowTemplateKey = props.flowTemplateKey,
|
|
@@ -55,7 +56,10 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
55
56
|
onOpenWangWang = props.onOpenWangWang,
|
|
56
57
|
callbackDealWorkOrderSuccess = props.callbackDealWorkOrderSuccess,
|
|
57
58
|
onJumpMemoPage = props.onJumpMemoPage,
|
|
58
|
-
onTalkChange = props.onTalkChange
|
|
59
|
+
onTalkChange = props.onTalkChange,
|
|
60
|
+
_props$autoSubmit = props.autoSubmit,
|
|
61
|
+
autoSubmit = _props$autoSubmit === void 0 ? false : _props$autoSubmit,
|
|
62
|
+
callbackAutoSubmitResult = props.callbackAutoSubmitResult;
|
|
59
63
|
var dispatch = useDispatch();
|
|
60
64
|
var flowRecordList = useSelector(selectFlowRecordList);
|
|
61
65
|
var remarkList = useSelector(selectRemarkRecordList);
|
|
@@ -379,7 +383,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
379
383
|
// 提交
|
|
380
384
|
var handleSubmit = /*#__PURE__*/function () {
|
|
381
385
|
var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
|
|
382
|
-
var _currentNodeDetail$wo7, _currentNodeDetail$wo8, formData,
|
|
386
|
+
var _currentNodeDetail$wo7, _currentNodeDetail$wo8, formData, _result, params, res, _currentNodeDetail$wo9, _controllerRef$curren3;
|
|
383
387
|
return _regeneratorRuntime().wrap(function _callee4$(_context4) {
|
|
384
388
|
while (1) switch (_context4.prev = _context4.next) {
|
|
385
389
|
case 0:
|
|
@@ -396,12 +400,12 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
396
400
|
return form.validateFields();
|
|
397
401
|
case 7:
|
|
398
402
|
formData = _context4.sent;
|
|
399
|
-
|
|
400
|
-
if (
|
|
403
|
+
_result = verifyHandle(formData, (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo7 = currentNodeDetail.workOrderTemplateInfo) === null || _currentNodeDetail$wo7 === void 0 ? void 0 : _currentNodeDetail$wo7.componentDtoList) || []);
|
|
404
|
+
if (_result.success) {
|
|
401
405
|
_context4.next = 13;
|
|
402
406
|
break;
|
|
403
407
|
}
|
|
404
|
-
message.error(
|
|
408
|
+
message.error(_result.message);
|
|
405
409
|
submitRequestUnlock();
|
|
406
410
|
return _context4.abrupt("return");
|
|
407
411
|
case 13:
|
|
@@ -419,20 +423,22 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
419
423
|
return s.shopId === formData.shopId;
|
|
420
424
|
}), 'accessToken', '')
|
|
421
425
|
});
|
|
422
|
-
|
|
423
|
-
|
|
424
|
-
|
|
426
|
+
console.debug('提交参数: ', currentNodeDetail, formData);
|
|
427
|
+
// TODO: 自动提交时开启接口静默模式
|
|
428
|
+
_context4.next = 17;
|
|
429
|
+
return submitWorkOrder(params, autoSubmit ? 'quiet' : 'error');
|
|
430
|
+
case 17:
|
|
425
431
|
res = _context4.sent;
|
|
426
432
|
submitRequestUnlock();
|
|
433
|
+
// TODO: 兼容批量提交逻辑
|
|
434
|
+
if (autoSubmit && typeof callbackAutoSubmitResult === 'function') {
|
|
435
|
+
callbackAutoSubmitResult({
|
|
436
|
+
success: res.success,
|
|
437
|
+
message: res.message
|
|
438
|
+
});
|
|
439
|
+
}
|
|
427
440
|
if (res.success) {
|
|
428
441
|
handleSuccessCallBack('submit');
|
|
429
|
-
dispatch(fetchPanelInfo({
|
|
430
|
-
flowTemplateKey: flowTemplateKey,
|
|
431
|
-
flowWorkOrderId: flowWorkOrderIdState
|
|
432
|
-
}, {
|
|
433
|
-
signal: controllerRef === null || controllerRef === void 0 ? void 0 : (_controllerRef$curren3 = controllerRef.current) === null || _controllerRef$curren3 === void 0 ? void 0 : _controllerRef$curren3.signal
|
|
434
|
-
}));
|
|
435
|
-
message.success('提交成功');
|
|
436
442
|
//删除缓存的订单信息
|
|
437
443
|
deleteCacheOrder({
|
|
438
444
|
templateList: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo9 = currentNodeDetail.workOrderTemplateInfo) === null || _currentNodeDetail$wo9 === void 0 ? void 0 : _currentNodeDetail$wo9.componentDtoList,
|
|
@@ -442,13 +448,40 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
442
448
|
plat: plat,
|
|
443
449
|
unDeleteOrderInfo: false
|
|
444
450
|
});
|
|
451
|
+
if (!autoSubmit) {
|
|
452
|
+
dispatch(fetchPanelInfo({
|
|
453
|
+
flowTemplateKey: flowTemplateKey,
|
|
454
|
+
flowWorkOrderId: flowWorkOrderIdState
|
|
455
|
+
}, {
|
|
456
|
+
signal: controllerRef === null || controllerRef === void 0 ? void 0 : (_controllerRef$curren3 = controllerRef.current) === null || _controllerRef$curren3 === void 0 ? void 0 : _controllerRef$curren3.signal
|
|
457
|
+
}));
|
|
458
|
+
message.success('提交成功');
|
|
459
|
+
}
|
|
445
460
|
}
|
|
446
|
-
_context4.next =
|
|
461
|
+
_context4.next = 31;
|
|
447
462
|
break;
|
|
448
|
-
case
|
|
449
|
-
_context4.prev =
|
|
463
|
+
case 23:
|
|
464
|
+
_context4.prev = 23;
|
|
450
465
|
_context4.t0 = _context4["catch"](0);
|
|
451
466
|
submitRequestUnlock();
|
|
467
|
+
if (!(autoSubmit && typeof callbackAutoSubmitResult === 'function')) {
|
|
468
|
+
_context4.next = 30;
|
|
469
|
+
break;
|
|
470
|
+
}
|
|
471
|
+
if (!(get(_context4.t0, 'errorFields.length') > 0)) {
|
|
472
|
+
_context4.next = 29;
|
|
473
|
+
break;
|
|
474
|
+
}
|
|
475
|
+
return _context4.abrupt("return", callbackAutoSubmitResult({
|
|
476
|
+
success: false,
|
|
477
|
+
message: get(_context4.t0, 'errorFields.0.errors.0', '组件校验失败')
|
|
478
|
+
}));
|
|
479
|
+
case 29:
|
|
480
|
+
return _context4.abrupt("return", callbackAutoSubmitResult({
|
|
481
|
+
success: false,
|
|
482
|
+
message: (_context4.t0 === null || _context4.t0 === void 0 ? void 0 : _context4.t0.message) || "接口请求异常"
|
|
483
|
+
}));
|
|
484
|
+
case 30:
|
|
452
485
|
if (get(_context4.t0, 'errorFields.length') > 0) {
|
|
453
486
|
setTimeout(function () {
|
|
454
487
|
var _get;
|
|
@@ -461,11 +494,11 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
461
494
|
// TODO: 解决显影导致的组件校验失败未提示问题
|
|
462
495
|
message.error(get(_context4.t0, 'errorFields.0.errors.0', '组件校验失败'));
|
|
463
496
|
}
|
|
464
|
-
case
|
|
497
|
+
case 31:
|
|
465
498
|
case "end":
|
|
466
499
|
return _context4.stop();
|
|
467
500
|
}
|
|
468
|
-
}, _callee4, null, [[0,
|
|
501
|
+
}, _callee4, null, [[0, 23]]);
|
|
469
502
|
}));
|
|
470
503
|
return function handleSubmit() {
|
|
471
504
|
return _ref4.apply(this, arguments);
|
|
@@ -908,7 +941,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
908
941
|
}
|
|
909
942
|
}, [flowTemplateKey, flowWorkOrderIdState]);
|
|
910
943
|
useEffect(function () {
|
|
911
|
-
if (flowTemplateId && flowWorkOrderIdState) {
|
|
944
|
+
if (flowTemplateId && flowWorkOrderIdState && !autoSubmit) {
|
|
912
945
|
dispatch(fetchAllFlowOperateRecord({
|
|
913
946
|
flowTemplateId: flowTemplateId,
|
|
914
947
|
flowWorkOrderId: flowWorkOrderIdState
|
|
@@ -918,14 +951,22 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
918
951
|
useEffect(function () {
|
|
919
952
|
dispatch(setPlat(plat));
|
|
920
953
|
}, [plat]);
|
|
954
|
+
useEffect(function () {
|
|
955
|
+
var _currentNodeDetail$wo24;
|
|
956
|
+
if (autoSubmit && !isNull(currentNodeDetail) && flowWorkOrderId === (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo24 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo24 === void 0 ? void 0 : _currentNodeDetail$wo24.flowWorkOrderId)) {
|
|
957
|
+
setTimeout(function () {
|
|
958
|
+
handleSubmit();
|
|
959
|
+
}, 0);
|
|
960
|
+
}
|
|
961
|
+
}, [currentNodeDetail]);
|
|
921
962
|
var isCurrentNodeHandler = useMemo(function () {
|
|
922
|
-
var _currentNodeDetail$no11, _currentNodeDetail$no12, _currentNodeDetail$no13, _currentNodeDetail$no14, _currentNodeDetail$no15, _currentNodeDetail$no16, _currentNodeDetail$
|
|
963
|
+
var _currentNodeDetail$no11, _currentNodeDetail$no12, _currentNodeDetail$no13, _currentNodeDetail$no14, _currentNodeDetail$no15, _currentNodeDetail$no16, _currentNodeDetail$wo25, _currentNodeDetail$no17, _currentNodeDetail$no18;
|
|
923
964
|
return currentUserHasOperatorAuth({
|
|
924
965
|
assistantList: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no11 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no11 === void 0 ? void 0 : _currentNodeDetail$no11.id) && assistantMap[currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no12 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no12 === void 0 ? void 0 : _currentNodeDetail$no12.id] || [],
|
|
925
966
|
currentUserKey: plat.userKey,
|
|
926
967
|
staffIds: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no13 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no13 === void 0 ? void 0 : (_currentNodeDetail$no14 = _currentNodeDetail$no13.assistants) === null || _currentNodeDetail$no14 === void 0 ? void 0 : _currentNodeDetail$no14.staffIds) || [],
|
|
927
968
|
operateDataPermission: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no15 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no15 === void 0 ? void 0 : (_currentNodeDetail$no16 = _currentNodeDetail$no15.assistants) === null || _currentNodeDetail$no16 === void 0 ? void 0 : _currentNodeDetail$no16.operateDataPermission,
|
|
928
|
-
handlerList: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
969
|
+
handlerList: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo25 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo25 === void 0 ? void 0 : _currentNodeDetail$wo25.handlerList) || [],
|
|
929
970
|
isAllStaff: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no17 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no17 === void 0 ? void 0 : (_currentNodeDetail$no18 = _currentNodeDetail$no17.assistants) === null || _currentNodeDetail$no18 === void 0 ? void 0 : _currentNodeDetail$no18.isAllStaff
|
|
930
971
|
});
|
|
931
972
|
}, [currentNodeDetail, plat, assistantMap]);
|
|
@@ -979,8 +1020,10 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
979
1020
|
onOpenWangWang: onOpenWangWang,
|
|
980
1021
|
onUpdateRemark: onUpdateRemark,
|
|
981
1022
|
onReminder: handleReminder,
|
|
982
|
-
queryRemarkList: queryRemarkList
|
|
983
|
-
|
|
1023
|
+
queryRemarkList: queryRemarkList,
|
|
1024
|
+
autoSubmit: autoSubmit
|
|
1025
|
+
}))), (remarkList === null || remarkList === void 0 ? void 0 : remarkList.length) > 0 && /*#__PURE__*/React.createElement(RemarkShow, _extends({}, remarkList[0], {
|
|
1026
|
+
readonly: readonly,
|
|
984
1027
|
handleOpenRemarkList: handleOpenRemarkList,
|
|
985
1028
|
handleOpenAddRemark: handleOpenAddRemark
|
|
986
1029
|
}))), getTag({
|
|
@@ -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;
|