@kmkf-fe-packages/kmkf-work-order-service-component 0.14.1-alpha.8 → 0.14.1

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.
Files changed (17) hide show
  1. package/dist/esm/FlowTemplateDetail/components/CloseModal/index.js +15 -6
  2. package/dist/esm/FlowTemplateDetail/components/CurrentNode/index.d.ts +1 -0
  3. package/dist/esm/FlowTemplateDetail/components/CurrentNode/index.js +6 -4
  4. package/dist/esm/FlowTemplateDetail/components/ForWardModal/index.js +15 -6
  5. package/dist/esm/FlowTemplateDetail/components/Item/index.d.ts +1 -0
  6. package/dist/esm/FlowTemplateDetail/components/Item/index.js +7 -4
  7. package/dist/esm/FlowTemplateDetail/components/RejectedModal/index.js +15 -6
  8. package/dist/esm/FlowTemplateDetail/components/RemarkModal/index.js +21 -12
  9. package/dist/esm/FlowTemplateDetail/components/StopModal/index.js +15 -6
  10. package/dist/esm/FlowTemplateDetail/components/WithdrawModal/index.js +15 -6
  11. package/dist/esm/FlowTemplateDetail/index.d.ts +5 -0
  12. package/dist/esm/FlowTemplateDetail/index.js +115 -82
  13. package/dist/esm/FlowTemplateDetail/index.less +6 -1
  14. package/dist/esm/common/utils/tools.js +4 -9
  15. package/dist/esm/model/flowTemplateDetail/index.js +35 -32
  16. package/dist/esm/model/logicFlow/selector.d.ts +0 -3
  17. package/package.json +5 -5
package/dist/esm/FlowTemplateDetail/components/CloseModal/index.js CHANGED
@@ -8,8 +8,8 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
8
8
  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; }
9
9
  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; } }
10
10
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
11
- import React from 'react';
12
- import { Modal, Form, Input } from 'antd';
11
+ import React, { useRef } from 'react';
12
+ import { Modal, Form, Input, message } from 'antd';
13
13
  import { useSelector, useDispatch } from 'react-redux';
14
14
  import { ApaasUploadAsync } from '@kmkf-fe-packages/basic-components';
15
15
  import { selectCurrentAction } from "../../../model/flowTemplateDetail/selector";
@@ -22,23 +22,31 @@ var CloseModal = function CloseModal(_ref) {
22
22
  form = _Form$useForm2[0];
23
23
  var action = useSelector(selectCurrentAction);
24
24
  var dispatch = useDispatch();
25
+ var imageRef = useRef();
25
26
  var closeModal = function closeModal() {
26
27
  dispatch(setAction());
27
28
  form.resetFields();
28
29
  };
29
30
  var onOK = /*#__PURE__*/function () {
30
31
  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
32
+ var _imageRef$current;
31
33
  var remark;
32
34
  return _regeneratorRuntime().wrap(function _callee$(_context) {
33
35
  while (1) switch (_context.prev = _context.next) {
34
36
  case 0:
35
- _context.next = 2;
36
- return form.validateFields();
37
+ if ((_imageRef$current = imageRef.current) !== null && _imageRef$current !== void 0 && _imageRef$current.taskCompleted) {
38
+ _context.next = 2;
39
+ break;
40
+ }
41
+ return _context.abrupt("return", message.error('请等待图片上传完成之后再继续提交'));
37
42
  case 2:
43
+ _context.next = 4;
44
+ return form.validateFields();
45
+ case 4:
38
46
  remark = _context.sent;
39
47
  handleClose(remark);
40
48
  form.resetFields();
41
- case 5:
49
+ case 7:
42
50
  case "end":
43
51
  return _context.stop();
44
52
  }
@@ -78,7 +86,8 @@ var CloseModal = function CloseModal(_ref) {
78
86
  }, /*#__PURE__*/React.createElement(ApaasUploadAsync, {
79
87
  maxCount: 5,
80
88
  uniqueKey: "remark",
81
- hostUrl: "https://kefu.kuaimai.com"
89
+ hostUrl: "https://kefu.kuaimai.com",
90
+ ref: imageRef
82
91
  })))));
83
92
  };
84
93
  export default CloseModal;
package/dist/esm/FlowTemplateDetail/components/CurrentNode/index.d.ts CHANGED
@@ -4,6 +4,7 @@ declare type CurrentNodeProps = {
4
4
  shopList: any[];
5
5
  form: FormInstance;
6
6
  defaultShopId?: string;
7
+ readonly?: boolean;
7
8
  onOpenWangWang?: (nick: string, id: string) => void;
8
9
  onUpdateRemark?: (remark: string, flag: string) => void;
9
10
  onReminder?: (type: string) => void;
package/dist/esm/FlowTemplateDetail/components/CurrentNode/index.js CHANGED
@@ -27,7 +27,9 @@ var CurrentNode = function CurrentNode(props) {
27
27
  onOpenWangWang = props.onOpenWangWang,
28
28
  onUpdateRemark = props.onUpdateRemark,
29
29
  onReminder = props.onReminder,
30
- defaultShopId = props.defaultShopId;
30
+ defaultShopId = props.defaultShopId,
31
+ _props$readonly = props.readonly,
32
+ readonly = _props$readonly === void 0 ? false : _props$readonly;
31
33
  var dispatch = useDispatch();
32
34
  var currentNodeDetail = useSelector(selectCurrentNodeDetail);
33
35
  var currentNodeTid = useSelector(selectTid);
@@ -125,11 +127,11 @@ var CurrentNode = function CurrentNode(props) {
125
127
  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Header, {
126
128
  tag: tag,
127
129
  nodeName: nodeName,
128
- showEdit: false,
130
+ showEdit: false && !readonly,
129
131
  showLook: false,
130
132
  handler: tag === 'artificial' ? currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo8 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo8 === void 0 ? void 0 : (_currentNodeDetail$wo9 = _currentNodeDetail$wo8.handlerList) === null || _currentNodeDetail$wo9 === void 0 ? void 0 : (_currentNodeDetail$wo10 = _currentNodeDetail$wo9[0]) === null || _currentNodeDetail$wo10 === void 0 ? void 0 : _currentNodeDetail$wo10.account : '',
131
- showWithdraw: tag === 'artificial' && (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo11 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo11 === void 0 ? void 0 : _currentNodeDetail$wo11.flowStatus) === FlowStatus.COMPLETED && isCurrentNodeHandler,
132
- showReminder: tag === 'artificial' && [NodeStatus.WAITING, NodeStatus.STOPPING].includes(currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo12 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo12 === void 0 ? void 0 : _currentNodeDetail$wo12.flowStatus) && isCurrentNodeHandler,
133
+ showWithdraw: tag === 'artificial' && (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo11 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo11 === void 0 ? void 0 : _currentNodeDetail$wo11.flowStatus) === FlowStatus.COMPLETED && isCurrentNodeHandler && !readonly,
134
+ showReminder: tag === 'artificial' && [NodeStatus.WAITING, NodeStatus.STOPPING].includes(currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo12 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo12 === void 0 ? void 0 : _currentNodeDetail$wo12.flowStatus) && isCurrentNodeHandler && !readonly,
133
135
  isReminder: JSON.parse((currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo13 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo13 === void 0 ? void 0 : (_currentNodeDetail$wo14 = _currentNodeDetail$wo13.jsonMap) === null || _currentNodeDetail$wo14 === void 0 ? void 0 : _currentNodeDetail$wo14.flowTags) || '[]').includes('REMINDER'),
134
136
  handleWithdraw: handleWithdraw,
135
137
  handleReminder: onReminder
package/dist/esm/FlowTemplateDetail/components/ForWardModal/index.js CHANGED
@@ -8,8 +8,8 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
8
8
  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; }
9
9
  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; } }
10
10
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
11
- import React, { useEffect } from 'react';
12
- import { Modal, Form, Select, Input, Spin } from 'antd';
11
+ import React, { useEffect, useRef } from 'react';
12
+ import { Modal, Form, Select, Input, Spin, message } from 'antd';
13
13
  import { useSelector, useDispatch } from 'react-redux';
14
14
  import { useRequest } from 'ahooks';
15
15
  import { ApaasUploadAsync } from '@kmkf-fe-packages/basic-components';
@@ -27,6 +27,7 @@ var ForWardModal = function ForWardModal(_ref) {
27
27
  form = _Form$useForm2[0];
28
28
  var action = useSelector(selectCurrentAction);
29
29
  var dispatch = useDispatch();
30
+ var imageRef = useRef();
30
31
  var closeModal = function closeModal() {
31
32
  dispatch(setAction());
32
33
  form.resetFields();
@@ -55,17 +56,24 @@ var ForWardModal = function ForWardModal(_ref) {
55
56
  });
56
57
  var handleOk = /*#__PURE__*/function () {
57
58
  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
59
+ var _imageRef$current;
58
60
  var formData;
59
61
  return _regeneratorRuntime().wrap(function _callee$(_context) {
60
62
  while (1) switch (_context.prev = _context.next) {
61
63
  case 0:
62
- _context.next = 2;
63
- return form.validateFields();
64
+ if ((_imageRef$current = imageRef.current) !== null && _imageRef$current !== void 0 && _imageRef$current.taskCompleted) {
65
+ _context.next = 2;
66
+ break;
67
+ }
68
+ return _context.abrupt("return", message.error('请等待图片上传完成之后再继续提交'));
64
69
  case 2:
70
+ _context.next = 4;
71
+ return form.validateFields();
72
+ case 4:
65
73
  formData = _context.sent;
66
74
  handleForWard(formData);
67
75
  form.resetFields();
68
- case 5:
76
+ case 7:
69
77
  case "end":
70
78
  return _context.stop();
71
79
  }
@@ -114,7 +122,8 @@ var ForWardModal = function ForWardModal(_ref) {
114
122
  }, /*#__PURE__*/React.createElement(ApaasUploadAsync, {
115
123
  maxCount: 5,
116
124
  uniqueKey: "remark",
117
- hostUrl: "https://kefu.kuaimai.com"
125
+ hostUrl: "https://kefu.kuaimai.com",
126
+ ref: imageRef
118
127
  })))));
119
128
  };
120
129
  export default ForWardModal;
package/dist/esm/FlowTemplateDetail/components/Item/index.d.ts CHANGED
@@ -10,6 +10,7 @@ interface NodeItem {
10
10
  queryRemarkList: () => void;
11
11
  handler: string;
12
12
  canWithdraw: boolean;
13
+ readonly?: boolean;
13
14
  }
14
15
  declare const NodeItem: (props: NodeItem) => React.JSX.Element;
15
16
  export default NodeItem;
package/dist/esm/FlowTemplateDetail/components/Item/index.js CHANGED
@@ -46,7 +46,9 @@ var NodeItem = function NodeItem(props) {
46
46
  onOpenWangWang = props.onOpenWangWang,
47
47
  queryRemarkList = props.queryRemarkList,
48
48
  handler = props.handler,
49
- canWithdraw = props.canWithdraw;
49
+ canWithdraw = props.canWithdraw,
50
+ _props$readonly = props.readonly,
51
+ readonly = _props$readonly === void 0 ? false : _props$readonly;
50
52
  var dispatch = useDispatch();
51
53
  var plat = useSelector(selectPlatInfo);
52
54
  var operateParams = useSelector(selectOperateParams);
@@ -197,7 +199,7 @@ var NodeItem = function NodeItem(props) {
197
199
  dispatch(setAction('withdraw'));
198
200
  };
199
201
  // 人工节点+打开状态+当前工单提交人是当前完成人+状态是待处理
200
- var showEdit = isArtificialNode && open && (data === null || data === void 0 ? void 0 : (_data$data3 = data.data) === null || _data$data3 === void 0 ? void 0 : (_data$data3$workOrder = _data$data3.workOrder) === null || _data$data3$workOrder === void 0 ? void 0 : _data$data3$workOrder.completedUserName) === plat.accountName && flowStatus === FlowStatus.PROCESSING;
202
+ var showEdit = isArtificialNode && open && (data === null || data === void 0 ? void 0 : (_data$data3 = data.data) === null || _data$data3 === void 0 ? void 0 : (_data$data3$workOrder = _data$data3.workOrder) === null || _data$data3$workOrder === void 0 ? void 0 : _data$data3$workOrder.completedUserName) === plat.accountName && !readonly && flowStatus === FlowStatus.PROCESSING;
201
203
 
202
204
  // 是否是当前节点处理人
203
205
  var isCurrentNodeHandler = useMemo(function () {
@@ -215,7 +217,7 @@ var NodeItem = function NodeItem(props) {
215
217
 
216
218
  // 撤回按钮展示逻辑
217
219
  // todo: 人工节点 + 节点权限 + 后续节点是否有人工节点或者自动化任务
218
- var showWithdraw = isArtificialNode && open && isCurrentNodeHandler && canWithdraw;
220
+ var showWithdraw = isArtificialNode && open && isCurrentNodeHandler && canWithdraw && !readonly;
219
221
  var _calcWorkOrderList = calcWorkOrderList([(data === null || data === void 0 ? void 0 : (_data$data10 = data.data) === null || _data$data10 === void 0 ? void 0 : _data$data10.workOrder) || {}], [].concat(_toConsumableArray((data === null || data === void 0 ? void 0 : (_data$data11 = data.data) === null || _data$data11 === void 0 ? void 0 : (_data$data11$workOrde = _data$data11.workOrderTemplateInfo) === null || _data$data11$workOrde === void 0 ? void 0 : _data$data11$workOrde.preNodeComponentDtoList) || []), _toConsumableArray((data === null || data === void 0 ? void 0 : (_data$data12 = data.data) === null || _data$data12 === void 0 ? void 0 : (_data$data12$workOrde = _data$data12.workOrderTemplateInfo) === null || _data$data12$workOrde === void 0 ? void 0 : _data$data12$workOrde.componentDtoList) || []))),
220
222
  _calcWorkOrderList2 = _slicedToArray(_calcWorkOrderList, 1),
221
223
  transData = _calcWorkOrderList2[0];
@@ -233,7 +235,8 @@ var NodeItem = function NodeItem(props) {
233
235
  handleWithdraw: handleWithdraw,
234
236
  loading: loading,
235
237
  handler: isArtificialNode ? handler : '',
236
- showWithdraw: showWithdraw
238
+ showWithdraw: showWithdraw,
239
+ showReminder: false
237
240
  }), /*#__PURE__*/React.createElement("div", {
238
241
  style: {
239
242
  display: open ? 'block' : 'none',
package/dist/esm/FlowTemplateDetail/components/RejectedModal/index.js CHANGED
@@ -8,8 +8,8 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
8
8
  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; }
9
9
  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; } }
10
10
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
11
- import React from 'react';
12
- import { Modal, Form, Input } from 'antd';
11
+ import React, { useRef } from 'react';
12
+ import { Modal, Form, Input, message } from 'antd';
13
13
  import { useSelector, useDispatch } from 'react-redux';
14
14
  import { ApaasUploadAsync } from '@kmkf-fe-packages/basic-components';
15
15
  import { selectCurrentAction } from "../../../model/flowTemplateDetail/selector";
@@ -22,23 +22,31 @@ var RejectedModal = function RejectedModal(_ref) {
22
22
  form = _Form$useForm2[0];
23
23
  var action = useSelector(selectCurrentAction);
24
24
  var dispatch = useDispatch();
25
+ var imageRef = useRef();
25
26
  var closeModal = function closeModal() {
26
27
  dispatch(setAction());
27
28
  form.resetFields();
28
29
  };
29
30
  var handleOk = /*#__PURE__*/function () {
30
31
  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
32
+ var _imageRef$current;
31
33
  var remark;
32
34
  return _regeneratorRuntime().wrap(function _callee$(_context) {
33
35
  while (1) switch (_context.prev = _context.next) {
34
36
  case 0:
35
- _context.next = 2;
36
- return form.validateFields();
37
+ if ((_imageRef$current = imageRef.current) !== null && _imageRef$current !== void 0 && _imageRef$current.taskCompleted) {
38
+ _context.next = 2;
39
+ break;
40
+ }
41
+ return _context.abrupt("return", message.error('请等待图片上传完成之后再继续提交'));
37
42
  case 2:
43
+ _context.next = 4;
44
+ return form.validateFields();
45
+ case 4:
38
46
  remark = _context.sent;
39
47
  handleReturnWorkOrder(remark);
40
48
  form.resetFields();
41
- case 5:
49
+ case 7:
42
50
  case "end":
43
51
  return _context.stop();
44
52
  }
@@ -79,7 +87,8 @@ var RejectedModal = function RejectedModal(_ref) {
79
87
  }, /*#__PURE__*/React.createElement(ApaasUploadAsync, {
80
88
  maxCount: 5,
81
89
  uniqueKey: "remark",
82
- hostUrl: "https://kefu.kuaimai.com"
90
+ hostUrl: "https://kefu.kuaimai.com",
91
+ ref: imageRef
83
92
  })))));
84
93
  };
85
94
  export default RejectedModal;
package/dist/esm/FlowTemplateDetail/components/RemarkModal/index.js CHANGED
@@ -13,8 +13,8 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
13
13
  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; }
14
14
  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; } }
15
15
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
16
- import React from 'react';
17
- import { Modal, Form, Input } from 'antd';
16
+ import React, { useRef } from 'react';
17
+ import { Modal, Form, Input, message } from 'antd';
18
18
  import { useSelector, useDispatch } from 'react-redux';
19
19
  import { ApaasUploadAsync } from '@kmkf-fe-packages/basic-components';
20
20
  import { selectAddRemarkVisible } from "../../../model/flowTemplateDetail/selector";
@@ -27,34 +27,42 @@ var RemarkModal = function RemarkModal(_ref) {
27
27
  form = _Form$useForm2[0];
28
28
  var visible = useSelector(selectAddRemarkVisible);
29
29
  var dispatch = useDispatch();
30
+ var imageRef = useRef();
30
31
  var closeModal = function closeModal() {
31
32
  dispatch(setAddRemarkVisible(false));
32
33
  form.resetFields();
33
34
  };
34
35
  var handleAddRemark = /*#__PURE__*/function () {
35
36
  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
37
+ var _imageRef$current;
36
38
  var formData;
37
39
  return _regeneratorRuntime().wrap(function _callee$(_context) {
38
40
  while (1) switch (_context.prev = _context.next) {
39
41
  case 0:
40
- _context.prev = 0;
41
- _context.next = 3;
42
+ if ((_imageRef$current = imageRef.current) !== null && _imageRef$current !== void 0 && _imageRef$current.taskCompleted) {
43
+ _context.next = 2;
44
+ break;
45
+ }
46
+ return _context.abrupt("return", message.error('请等待图片上传完成之后再继续提交'));
47
+ case 2:
48
+ _context.prev = 2;
49
+ _context.next = 5;
42
50
  return form.validateFields();
43
- case 3:
51
+ case 5:
44
52
  formData = _context.sent;
45
53
  handleSubmitRemark(_objectSpread({}, formData));
46
54
  form.resetFields();
47
- _context.next = 11;
55
+ _context.next = 13;
48
56
  break;
49
- case 8:
50
- _context.prev = 8;
51
- _context.t0 = _context["catch"](0);
57
+ case 10:
58
+ _context.prev = 10;
59
+ _context.t0 = _context["catch"](2);
52
60
  console.log('提交备注时备注信息必填');
53
- case 11:
61
+ case 13:
54
62
  case "end":
55
63
  return _context.stop();
56
64
  }
57
- }, _callee, null, [[0, 8]]);
65
+ }, _callee, null, [[2, 10]]);
58
66
  }));
59
67
  return function handleAddRemark() {
60
68
  return _ref2.apply(this, arguments);
@@ -87,7 +95,8 @@ var RemarkModal = function RemarkModal(_ref) {
87
95
  }, /*#__PURE__*/React.createElement(ApaasUploadAsync, {
88
96
  maxCount: 5,
89
97
  uniqueKey: "remark",
90
- hostUrl: "https://kefu.kuaimai.com"
98
+ hostUrl: "https://kefu.kuaimai.com",
99
+ ref: imageRef
91
100
  })))));
92
101
  };
93
102
  export default RemarkModal;
package/dist/esm/FlowTemplateDetail/components/StopModal/index.js CHANGED
@@ -8,8 +8,8 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
8
8
  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; }
9
9
  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; } }
10
10
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
11
- import React from 'react';
12
- import { Modal, Form, Input } from 'antd';
11
+ import React, { useRef } from 'react';
12
+ import { Modal, Form, Input, message } from 'antd';
13
13
  import { useSelector, useDispatch } from 'react-redux';
14
14
  import { ApaasUploadAsync } from '@kmkf-fe-packages/basic-components';
15
15
  import { selectCurrentAction } from "../../../model/flowTemplateDetail/selector";
@@ -22,23 +22,31 @@ var StopModal = function StopModal(_ref) {
22
22
  form = _Form$useForm2[0];
23
23
  var action = useSelector(selectCurrentAction);
24
24
  var dispatch = useDispatch();
25
+ var imageRef = useRef();
25
26
  var closeModal = function closeModal() {
26
27
  dispatch(setAction());
27
28
  form.resetFields();
28
29
  };
29
30
  var handleOK = /*#__PURE__*/function () {
30
31
  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
32
+ var _imageRef$current;
31
33
  var remark;
32
34
  return _regeneratorRuntime().wrap(function _callee$(_context) {
33
35
  while (1) switch (_context.prev = _context.next) {
34
36
  case 0:
35
- _context.next = 2;
36
- return form.validateFields();
37
+ if ((_imageRef$current = imageRef.current) !== null && _imageRef$current !== void 0 && _imageRef$current.taskCompleted) {
38
+ _context.next = 2;
39
+ break;
40
+ }
41
+ return _context.abrupt("return", message.error('请等待图片上传完成之后再继续提交'));
37
42
  case 2:
43
+ _context.next = 4;
44
+ return form.validateFields();
45
+ case 4:
38
46
  remark = _context.sent;
39
47
  handleStop(remark);
40
48
  form.resetFields();
41
- case 5:
49
+ case 7:
42
50
  case "end":
43
51
  return _context.stop();
44
52
  }
@@ -78,7 +86,8 @@ var StopModal = function StopModal(_ref) {
78
86
  }, /*#__PURE__*/React.createElement(ApaasUploadAsync, {
79
87
  maxCount: 5,
80
88
  uniqueKey: "remark",
81
- hostUrl: "https://kefu.kuaimai.com"
89
+ hostUrl: "https://kefu.kuaimai.com",
90
+ ref: imageRef
82
91
  })))));
83
92
  };
84
93
  export default StopModal;
package/dist/esm/FlowTemplateDetail/components/WithdrawModal/index.js CHANGED
@@ -8,8 +8,8 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
8
8
  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; }
9
9
  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; } }
10
10
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
11
- import React from 'react';
12
- import { Modal, Form, Input } from 'antd';
11
+ import React, { useRef } from 'react';
12
+ import { Modal, Form, Input, message } from 'antd';
13
13
  import { useSelector, useDispatch } from 'react-redux';
14
14
  import { ApaasUploadAsync } from '@kmkf-fe-packages/basic-components';
15
15
  import { selectCurrentAction } from "../../../model/flowTemplateDetail/selector";
@@ -22,23 +22,31 @@ var WithdrawModal = function WithdrawModal(_ref) {
22
22
  form = _Form$useForm2[0];
23
23
  var action = useSelector(selectCurrentAction);
24
24
  var dispatch = useDispatch();
25
+ var imageRef = useRef();
25
26
  var closeModal = function closeModal() {
26
27
  dispatch(setAction());
27
28
  form.resetFields();
28
29
  };
29
30
  var handleOK = /*#__PURE__*/function () {
30
31
  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
32
+ var _imageRef$current;
31
33
  var remark;
32
34
  return _regeneratorRuntime().wrap(function _callee$(_context) {
33
35
  while (1) switch (_context.prev = _context.next) {
34
36
  case 0:
35
- _context.next = 2;
36
- return form.validateFields();
37
+ if ((_imageRef$current = imageRef.current) !== null && _imageRef$current !== void 0 && _imageRef$current.taskCompleted) {
38
+ _context.next = 2;
39
+ break;
40
+ }
41
+ return _context.abrupt("return", message.error('请等待图片上传完成之后再继续提交'));
37
42
  case 2:
43
+ _context.next = 4;
44
+ return form.validateFields();
45
+ case 4:
38
46
  remark = _context.sent;
39
47
  handleWithdraw(remark);
40
48
  form.resetFields();
41
- case 5:
49
+ case 7:
42
50
  case "end":
43
51
  return _context.stop();
44
52
  }
@@ -78,7 +86,8 @@ var WithdrawModal = function WithdrawModal(_ref) {
78
86
  }, /*#__PURE__*/React.createElement(ApaasUploadAsync, {
79
87
  maxCount: 5,
80
88
  uniqueKey: "remark",
81
- hostUrl: "https://kefu.kuaimai.com"
89
+ hostUrl: "https://kefu.kuaimai.com",
90
+ ref: imageRef
82
91
  })))));
83
92
  };
84
93
  export default WithdrawModal;
package/dist/esm/FlowTemplateDetail/index.d.ts CHANGED
@@ -6,9 +6,14 @@ declare type FlowTemplateDetailProps = {
6
6
  flowWorkOrderId?: string;
7
7
  plat: PlatFormInfo;
8
8
  shopList: any[];
9
+ readonly?: boolean;
9
10
  onOpenWangWang?: (nick: string, id: string) => void;
10
11
  callbackDealWorkOrderSuccess?: (type: string, workOrderId?: string) => void;
11
12
  onJumpMemoPage?: () => void;
13
+ onTalkChange?: (data: {
14
+ tid: string;
15
+ shopId: string;
16
+ }) => void;
12
17
  };
13
18
  declare const ProviderWrap: (props: FlowTemplateDetailProps) => React.JSX.Element;
14
19
  export default ProviderWrap;
package/dist/esm/FlowTemplateDetail/index.js CHANGED
@@ -17,7 +17,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
17
17
  import React, { useEffect, useState, useRef, useMemo } from 'react';
18
18
  import { Timeline, ConfigProvider, Form, message, Alert, Button, Spin } from 'antd';
19
19
  import { get, find, isEmpty } from 'lodash';
20
- import { useDispatch, useSelector, Provider } from 'react-redux';
20
+ import { useDispatch, useSelector, Provider, batch } from 'react-redux';
21
21
  import store from "../model/store";
22
22
  import zhCN from 'antd/es/locale/zh_CN';
23
23
  import { AddressData, ExpressData, ExpressInterceptData, PlatData, BsAddressData } from '@kmkf-fe-packages/kmkf-utils';
@@ -49,9 +49,12 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
49
49
  shopList = _props$shopList === void 0 ? [] : _props$shopList,
50
50
  flowWorkOrderId = props.flowWorkOrderId,
51
51
  plat = props.plat,
52
+ _props$readonly = props.readonly,
53
+ readonly = _props$readonly === void 0 ? false : _props$readonly,
52
54
  onOpenWangWang = props.onOpenWangWang,
53
55
  callbackDealWorkOrderSuccess = props.callbackDealWorkOrderSuccess,
54
- onJumpMemoPage = props.onJumpMemoPage;
56
+ onJumpMemoPage = props.onJumpMemoPage,
57
+ onTalkChange = props.onTalkChange;
55
58
  var dispatch = useDispatch();
56
59
  var flowRecordList = useSelector(selectFlowRecordList);
57
60
  var remarkList = useSelector(selectRemarkRecordList);
@@ -118,7 +121,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
118
121
  }
119
122
  if (shop) {
120
123
  shopUniqueKey = shop.accessToken || '';
121
- isShowRemark = !shop.notJoin && !!shop.shopSourceStr && ['TAOBAO', 'JD', 'PDD', 'KS', 'FXG'].includes(shop.shopSourceStr);
124
+ isShowRemark = !shop.notJoin && !!shop.shopSourceStr && !readonly && ['TAOBAO', 'JD', 'PDD', 'KS', 'FXG'].includes(shop.shopSourceStr);
122
125
  shopSourceStr = shop.shopSourceStr;
123
126
  }
124
127
 
@@ -183,6 +186,13 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
183
186
  sShopUniqueKey && sTid && fetchRemark(shopId, sTid);
184
187
  }
185
188
  }, [sShopUniqueKey, sTid, currentNodeDetail]);
189
+ useEffect(function () {
190
+ // 往外通知选中了订单号
191
+ onTalkChange === null || onTalkChange === void 0 ? void 0 : onTalkChange({
192
+ tid: tid,
193
+ shopId: shopId || formShopId
194
+ });
195
+ }, [tid, formShopId]);
186
196
  useEffect(function () {
187
197
  return function () {
188
198
  form.resetFields();
@@ -204,8 +214,8 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
204
214
  }
205
215
  return _context.abrupt("return");
206
216
  case 3:
207
- dispatch(setLoading(true));
208
217
  saveRequestLock.current = true;
218
+ dispatch(setLoading(true));
209
219
  update = !!(currentNodeDetail !== null && currentNodeDetail !== void 0 && currentNodeDetail.workOrder); // 如果workOrder有值的情况下，表示我们是更新操作
210
220
  formData = form.getFieldsValue();
211
221
  if (formData.shopId) {
@@ -274,7 +284,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
274
284
  // 开启
275
285
  var handleStart = /*#__PURE__*/function () {
276
286
  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
277
- var _currentNodeDetail$no3, _currentNodeDetail$wo6, _res$data4, _res$data4$failList, res, _controllerRef$curren, _res$data5, _res$data5$failList, _res$data5$failList$;
287
+ var _currentNodeDetail$no3, _currentNodeDetail$wo6, _res$data4, _res$data4$failList, res, _res$data5, _res$data5$failList, _res$data5$failList$;
278
288
  return _regeneratorRuntime().wrap(function _callee2$(_context2) {
279
289
  while (1) switch (_context2.prev = _context2.next) {
280
290
  case 0:
@@ -293,17 +303,20 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
293
303
  if (((_res$data4 = res.data) === null || _res$data4 === void 0 ? void 0 : (_res$data4$failList = _res$data4.failList) === null || _res$data4$failList === void 0 ? void 0 : _res$data4$failList.length) === 0) {
294
304
  message.success('开启工单成功');
295
305
  handleSuccessCallBack('open');
296
- dispatch(setAction());
297
- dispatch(fetchPanelInfo({
298
- flowTemplateKey: flowTemplateKey,
299
- flowWorkOrderId: flowWorkOrderIdState
300
- }, {
301
- signal: controllerRef === null || controllerRef === void 0 ? void 0 : (_controllerRef$curren = controllerRef.current) === null || _controllerRef$curren === void 0 ? void 0 : _controllerRef$curren.signal
302
- }));
303
- dispatch(fetchAllFlowOperateRecord({
304
- flowTemplateId: flowTemplateId,
305
- flowWorkOrderId: flowWorkOrderIdState
306
- }));
306
+ batch(function () {
307
+ var _controllerRef$curren;
308
+ dispatch(setAction());
309
+ dispatch(fetchPanelInfo({
310
+ flowTemplateKey: flowTemplateKey,
311
+ flowWorkOrderId: flowWorkOrderIdState
312
+ }, {
313
+ signal: controllerRef === null || controllerRef === void 0 ? void 0 : (_controllerRef$curren = controllerRef.current) === null || _controllerRef$curren === void 0 ? void 0 : _controllerRef$curren.signal
314
+ }));
315
+ dispatch(fetchAllFlowOperateRecord({
316
+ flowTemplateId: flowTemplateId,
317
+ flowWorkOrderId: flowWorkOrderIdState
318
+ }));
319
+ });
307
320
  } else {
308
321
  message.error((_res$data5 = res.data) === null || _res$data5 === void 0 ? void 0 : (_res$data5$failList = _res$data5.failList) === null || _res$data5$failList === void 0 ? void 0 : (_res$data5$failList$ = _res$data5$failList[0]) === null || _res$data5$failList$ === void 0 ? void 0 : _res$data5$failList$.failReason);
309
322
  }
@@ -337,8 +350,8 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
337
350
  }
338
351
  return _context3.abrupt("return");
339
352
  case 3:
340
- dispatch(setLoading(true));
341
353
  submitRequestLock.current = true;
354
+ dispatch(setLoading(true));
342
355
  _context3.next = 7;
343
356
  return form.validateFields();
344
357
  case 7:
@@ -482,7 +495,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
482
495
  // 暂停工单
483
496
  var handleStop = /*#__PURE__*/function () {
484
497
  var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(formData) {
485
- var _currentNodeDetail$no4, _currentNodeDetail$wo10, _res$data6, _res$data6$failList, res, _controllerRef$curren3, _res$data7, _res$data7$failList, _res$data7$failList$;
498
+ var _currentNodeDetail$no4, _currentNodeDetail$wo10, _res$data6, _res$data6$failList, res, _res$data7, _res$data7$failList, _res$data7$failList$;
486
499
  return _regeneratorRuntime().wrap(function _callee5$(_context5) {
487
500
  while (1) switch (_context5.prev = _context5.next) {
488
501
  case 0:
@@ -501,18 +514,21 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
501
514
  if (((_res$data6 = res.data) === null || _res$data6 === void 0 ? void 0 : (_res$data6$failList = _res$data6.failList) === null || _res$data6$failList === void 0 ? void 0 : _res$data6$failList.length) === 0) {
502
515
  message.success('暂停工单成功');
503
516
  handleSuccessCallBack('stop');
504
- dispatch(setAction());
505
- // TODO: 暂停之后，重新查询一次
506
- dispatch(fetchPanelInfo({
507
- flowTemplateKey: flowTemplateKey,
508
- flowWorkOrderId: flowWorkOrderIdState
509
- }, {
510
- signal: controllerRef === null || controllerRef === void 0 ? void 0 : (_controllerRef$curren3 = controllerRef.current) === null || _controllerRef$curren3 === void 0 ? void 0 : _controllerRef$curren3.signal
511
- }));
512
- dispatch(fetchAllFlowOperateRecord({
513
- flowTemplateId: flowTemplateId,
514
- flowWorkOrderId: flowWorkOrderIdState
515
- }));
517
+ batch(function () {
518
+ var _controllerRef$curren3;
519
+ dispatch(setAction());
520
+ // TODO: 暂停之后，重新查询一次
521
+ dispatch(fetchPanelInfo({
522
+ flowTemplateKey: flowTemplateKey,
523
+ flowWorkOrderId: flowWorkOrderIdState
524
+ }, {
525
+ signal: controllerRef === null || controllerRef === void 0 ? void 0 : (_controllerRef$curren3 = controllerRef.current) === null || _controllerRef$curren3 === void 0 ? void 0 : _controllerRef$curren3.signal
526
+ }));
527
+ dispatch(fetchAllFlowOperateRecord({
528
+ flowTemplateId: flowTemplateId,
529
+ flowWorkOrderId: flowWorkOrderIdState
530
+ }));
531
+ });
516
532
  } else {
517
533
  message.error((_res$data7 = res.data) === null || _res$data7 === void 0 ? void 0 : (_res$data7$failList = _res$data7.failList) === null || _res$data7$failList === void 0 ? void 0 : (_res$data7$failList$ = _res$data7$failList[0]) === null || _res$data7$failList$ === void 0 ? void 0 : _res$data7$failList$.failReason);
518
534
  }
@@ -535,7 +551,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
535
551
  // 关闭工单
536
552
  var handleClose = /*#__PURE__*/function () {
537
553
  var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(formData) {
538
- var _currentNodeDetail$wo11, _currentNodeDetail$no5, _currentNodeDetail$wo12, _res$data8, _res$data8$failList, res, _controllerRef$curren4, _res$data9, _res$data9$failList, _res$data9$failList$;
554
+ var _currentNodeDetail$wo11, _currentNodeDetail$no5, _currentNodeDetail$wo12, _res$data8, _res$data8$failList, res, _res$data9, _res$data9$failList, _res$data9$failList$;
539
555
  return _regeneratorRuntime().wrap(function _callee6$(_context6) {
540
556
  while (1) switch (_context6.prev = _context6.next) {
541
557
  case 0:
@@ -555,13 +571,16 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
555
571
  if (((_res$data8 = res.data) === null || _res$data8 === void 0 ? void 0 : (_res$data8$failList = _res$data8.failList) === null || _res$data8$failList === void 0 ? void 0 : _res$data8$failList.length) === 0) {
556
572
  handleSuccessCallBack('close');
557
573
  message.success('关闭工单成功');
558
- dispatch(fetchPanelInfo({
559
- flowTemplateKey: flowTemplateKey,
560
- flowWorkOrderId: flowWorkOrderIdState
561
- }, {
562
- signal: controllerRef === null || controllerRef === void 0 ? void 0 : (_controllerRef$curren4 = controllerRef.current) === null || _controllerRef$curren4 === void 0 ? void 0 : _controllerRef$curren4.signal
563
- }));
564
- dispatch(setAction());
574
+ batch(function () {
575
+ var _controllerRef$curren4;
576
+ dispatch(fetchPanelInfo({
577
+ flowTemplateKey: flowTemplateKey,
578
+ flowWorkOrderId: flowWorkOrderIdState
579
+ }, {
580
+ signal: controllerRef === null || controllerRef === void 0 ? void 0 : (_controllerRef$curren4 = controllerRef.current) === null || _controllerRef$curren4 === void 0 ? void 0 : _controllerRef$curren4.signal
581
+ }));
582
+ dispatch(setAction());
583
+ });
565
584
  } else {
566
585
  message.error((_res$data9 = res.data) === null || _res$data9 === void 0 ? void 0 : (_res$data9$failList = _res$data9.failList) === null || _res$data9$failList === void 0 ? void 0 : (_res$data9$failList$ = _res$data9$failList[0]) === null || _res$data9$failList$ === void 0 ? void 0 : _res$data9$failList$.failReason);
567
586
  }
@@ -584,7 +603,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
584
603
  // 转交处理人
585
604
  var handleForWard = /*#__PURE__*/function () {
586
605
  var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(formData) {
587
- var _currentNodeDetail$no6, _currentNodeDetail$wo13, _res$data10, _res$data10$failList, res, _controllerRef$curren5, _res$data11, _res$data11$failList, _res$data11$failList$;
606
+ var _currentNodeDetail$no6, _currentNodeDetail$wo13, _res$data10, _res$data10$failList, res, _res$data11, _res$data11$failList, _res$data11$failList$;
588
607
  return _regeneratorRuntime().wrap(function _callee7$(_context7) {
589
608
  while (1) switch (_context7.prev = _context7.next) {
590
609
  case 0:
@@ -603,13 +622,16 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
603
622
  if (((_res$data10 = res.data) === null || _res$data10 === void 0 ? void 0 : (_res$data10$failList = _res$data10.failList) === null || _res$data10$failList === void 0 ? void 0 : _res$data10$failList.length) === 0) {
604
623
  handleSuccessCallBack('forward');
605
624
  message.success('转交成功');
606
- dispatch(fetchPanelInfo({
607
- flowTemplateKey: flowTemplateKey,
608
- flowWorkOrderId: flowWorkOrderIdState
609
- }, {
610
- signal: controllerRef === null || controllerRef === void 0 ? void 0 : (_controllerRef$curren5 = controllerRef.current) === null || _controllerRef$curren5 === void 0 ? void 0 : _controllerRef$curren5.signal
611
- }));
612
- dispatch(setAction());
625
+ batch(function () {
626
+ var _controllerRef$curren5;
627
+ dispatch(fetchPanelInfo({
628
+ flowTemplateKey: flowTemplateKey,
629
+ flowWorkOrderId: flowWorkOrderIdState
630
+ }, {
631
+ signal: controllerRef === null || controllerRef === void 0 ? void 0 : (_controllerRef$curren5 = controllerRef.current) === null || _controllerRef$curren5 === void 0 ? void 0 : _controllerRef$curren5.signal
632
+ }));
633
+ dispatch(setAction());
634
+ });
613
635
  } else {
614
636
  message.error((_res$data11 = res.data) === null || _res$data11 === void 0 ? void 0 : (_res$data11$failList = _res$data11.failList) === null || _res$data11$failList === void 0 ? void 0 : (_res$data11$failList$ = _res$data11$failList[0]) === null || _res$data11$failList$ === void 0 ? void 0 : _res$data11$failList$.failReason);
615
637
  }
@@ -632,7 +654,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
632
654
  // 驳回
633
655
  var handleReturnWorkOrder = /*#__PURE__*/function () {
634
656
  var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(formData) {
635
- var _currentNodeDetail$no7, _currentNodeDetail$wo14, _res$data12, _res$data12$failList, res, _controllerRef$curren6, _res$data13, _res$data13$failList, _res$data13$failList$;
657
+ var _currentNodeDetail$no7, _currentNodeDetail$wo14, _res$data12, _res$data12$failList, res, _res$data13, _res$data13$failList, _res$data13$failList$;
636
658
  return _regeneratorRuntime().wrap(function _callee8$(_context8) {
637
659
  while (1) switch (_context8.prev = _context8.next) {
638
660
  case 0:
@@ -651,13 +673,16 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
651
673
  if (((_res$data12 = res.data) === null || _res$data12 === void 0 ? void 0 : (_res$data12$failList = _res$data12.failList) === null || _res$data12$failList === void 0 ? void 0 : _res$data12$failList.length) === 0) {
652
674
  handleSuccessCallBack('rejected');
653
675
  message.success('驳回成功');
654
- dispatch(fetchPanelInfo({
655
- flowTemplateKey: flowTemplateKey,
656
- flowWorkOrderId: flowWorkOrderIdState
657
- }, {
658
- signal: controllerRef === null || controllerRef === void 0 ? void 0 : (_controllerRef$curren6 = controllerRef.current) === null || _controllerRef$curren6 === void 0 ? void 0 : _controllerRef$curren6.signal
659
- }));
660
- dispatch(setAction());
676
+ batch(function () {
677
+ var _controllerRef$curren6;
678
+ dispatch(fetchPanelInfo({
679
+ flowTemplateKey: flowTemplateKey,
680
+ flowWorkOrderId: flowWorkOrderIdState
681
+ }, {
682
+ signal: controllerRef === null || controllerRef === void 0 ? void 0 : (_controllerRef$curren6 = controllerRef.current) === null || _controllerRef$curren6 === void 0 ? void 0 : _controllerRef$curren6.signal
683
+ }));
684
+ dispatch(setAction());
685
+ });
661
686
  } else {
662
687
  message.error((_res$data13 = res.data) === null || _res$data13 === void 0 ? void 0 : (_res$data13$failList = _res$data13.failList) === null || _res$data13$failList === void 0 ? void 0 : (_res$data13$failList$ = _res$data13$failList[0]) === null || _res$data13$failList$ === void 0 ? void 0 : _res$data13$failList$.failReason);
663
688
  }
@@ -680,7 +705,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
680
705
  // 撤回
681
706
  var handleWithdraw = /*#__PURE__*/function () {
682
707
  var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(formData) {
683
- var _currentNodeDetail$no8, _currentNodeDetail$wo15, _res$data14, _res$data14$failList, res, _controllerRef$curren7, _res$data15, _res$data15$failList, _res$data15$failList$;
708
+ var _currentNodeDetail$no8, _currentNodeDetail$wo15, _res$data14, _res$data14$failList, res, _res$data15, _res$data15$failList, _res$data15$failList$;
684
709
  return _regeneratorRuntime().wrap(function _callee9$(_context9) {
685
710
  while (1) switch (_context9.prev = _context9.next) {
686
711
  case 0:
@@ -700,17 +725,20 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
700
725
  if (((_res$data14 = res.data) === null || _res$data14 === void 0 ? void 0 : (_res$data14$failList = _res$data14.failList) === null || _res$data14$failList === void 0 ? void 0 : _res$data14$failList.length) === 0) {
701
726
  handleSuccessCallBack('withdraw');
702
727
  message.success('撤回成功');
703
- dispatch(fetchPanelInfo({
704
- flowTemplateKey: flowTemplateKey,
705
- flowWorkOrderId: flowWorkOrderIdState
706
- }, {
707
- signal: controllerRef === null || controllerRef === void 0 ? void 0 : (_controllerRef$curren7 = controllerRef.current) === null || _controllerRef$curren7 === void 0 ? void 0 : _controllerRef$curren7.signal
708
- }));
709
- dispatch(fetchAllFlowOperateRecord({
710
- flowTemplateId: flowTemplateId,
711
- flowWorkOrderId: flowWorkOrderIdState
712
- }));
713
- dispatch(setAction());
728
+ batch(function () {
729
+ var _controllerRef$curren7;
730
+ dispatch(fetchPanelInfo({
731
+ flowTemplateKey: flowTemplateKey,
732
+ flowWorkOrderId: flowWorkOrderIdState
733
+ }, {
734
+ signal: controllerRef === null || controllerRef === void 0 ? void 0 : (_controllerRef$curren7 = controllerRef.current) === null || _controllerRef$curren7 === void 0 ? void 0 : _controllerRef$curren7.signal
735
+ }));
736
+ dispatch(fetchAllFlowOperateRecord({
737
+ flowTemplateId: flowTemplateId,
738
+ flowWorkOrderId: flowWorkOrderIdState
739
+ }));
740
+ dispatch(setAction());
741
+ });
714
742
  } else {
715
743
  message.error((_res$data15 = res.data) === null || _res$data15 === void 0 ? void 0 : (_res$data15$failList = _res$data15.failList) === null || _res$data15$failList === void 0 ? void 0 : (_res$data15$failList$ = _res$data15$failList[0]) === null || _res$data15$failList$ === void 0 ? void 0 : _res$data15$failList$.failReason);
716
744
  }
@@ -733,7 +761,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
733
761
  //催单
734
762
  var handleReminder = /*#__PURE__*/function () {
735
763
  var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(type) {
736
- var _currentNodeDetail$wo16, _currentNodeDetail$wo17, _currentNodeDetail$no9, _currentNodeDetail$wo18, _currentNodeDetail$wo19, _currentNodeDetail$wo20, _currentNodeDetail$wo21, _currentNodeDetail$no10, _currentNodeDetail$wo22, api, flowTags, newFlowTags, params, res, _controllerRef$curren8;
764
+ var _currentNodeDetail$wo16, _currentNodeDetail$wo17, _currentNodeDetail$no9, _currentNodeDetail$wo18, _currentNodeDetail$wo19, _currentNodeDetail$wo20, _currentNodeDetail$wo21, _currentNodeDetail$no10, _currentNodeDetail$wo22, api, flowTags, newFlowTags, params, res;
737
765
  return _regeneratorRuntime().wrap(function _callee10$(_context10) {
738
766
  while (1) switch (_context10.prev = _context10.next) {
739
767
  case 0:
@@ -775,16 +803,19 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
775
803
  if (res.success) {
776
804
  handleSuccessCallBack(type);
777
805
  message.success(type === 'reminder' ? '催单成功' : '取消催单成功');
778
- dispatch(fetchPanelInfo({
779
- flowTemplateKey: flowTemplateKey,
780
- flowWorkOrderId: flowWorkOrderIdState
781
- }, {
782
- signal: controllerRef === null || controllerRef === void 0 ? void 0 : (_controllerRef$curren8 = controllerRef.current) === null || _controllerRef$curren8 === void 0 ? void 0 : _controllerRef$curren8.signal
783
- }));
784
- dispatch(fetchAllFlowOperateRecord({
785
- flowTemplateId: flowTemplateId,
786
- flowWorkOrderId: flowWorkOrderIdState
787
- }));
806
+ batch(function () {
807
+ var _controllerRef$curren8;
808
+ dispatch(fetchPanelInfo({
809
+ flowTemplateKey: flowTemplateKey,
810
+ flowWorkOrderId: flowWorkOrderIdState
811
+ }, {
812
+ signal: controllerRef === null || controllerRef === void 0 ? void 0 : (_controllerRef$curren8 = controllerRef.current) === null || _controllerRef$curren8 === void 0 ? void 0 : _controllerRef$curren8.signal
813
+ }));
814
+ dispatch(fetchAllFlowOperateRecord({
815
+ flowTemplateId: flowTemplateId,
816
+ flowWorkOrderId: flowWorkOrderIdState
817
+ }));
818
+ });
788
819
  } else {
789
820
  message.error(res.message);
790
821
  }
@@ -872,7 +903,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
872
903
  }, "\u6D41\u7A0B\u72B6\u6001\uFF1A", /*#__PURE__*/React.createElement("div", {
873
904
  className: "status ".concat(flowStatus)
874
905
  }), /*#__PURE__*/React.createElement("span", null, FLOW_STATUS_V2[flowStatus])), /*#__PURE__*/React.createElement("div", {
875
- className: "center ".concat(flowStatus ? 'hasStatus' : '')
906
+ className: "center ".concat(flowStatus ? 'hasStatus' : '', " ").concat(readonly ? 'readonly' : '')
876
907
  }, currentTradeIdLinkWorkOrderId.total > 0 && /*#__PURE__*/React.createElement("div", {
877
908
  className: "alertRepeatTradeId"
878
909
  }, /*#__PURE__*/React.createElement(Alert, {
@@ -884,7 +915,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
884
915
  className: "fillButton"
885
916
  }, "\u7ACB\u5373\u586B\u5145")))
886
917
  })), /*#__PURE__*/React.createElement(Timeline, null, flowRecordList === null || flowRecordList === void 0 ? void 0 : flowRecordList.map(function (flowRecord, index) {
887
- var canWithdraw = currentNodeCanWithdraw(index);
918
+ var canWithdraw = currentNodeCanWithdraw(index) && !readonly;
888
919
  return /*#__PURE__*/React.createElement(Timeline.Item, null, /*#__PURE__*/React.createElement(NodeItem, {
889
920
  flowTemplateId: flowTemplateId,
890
921
  flowWorkOrderId: flowWorkOrderIdState,
@@ -895,22 +926,24 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
895
926
  onOpenWangWang: onOpenWangWang,
896
927
  queryRemarkList: queryRemarkList,
897
928
  handler: flowRecord.operator,
898
- canWithdraw: canWithdraw
929
+ canWithdraw: canWithdraw,
930
+ readonly: readonly
899
931
  }));
900
932
  }), currentNodeDetail && /*#__PURE__*/React.createElement(Timeline.Item, null, /*#__PURE__*/React.createElement(CurrentNode, {
901
933
  shopList: shopList,
902
934
  form: form,
903
935
  defaultShopId: defaultShopId,
936
+ readonly: readonly,
904
937
  onOpenWangWang: onOpenWangWang,
905
938
  onUpdateRemark: onUpdateRemark,
906
939
  onReminder: handleReminder
907
- }))), (remarkList === null || remarkList === void 0 ? void 0 : remarkList.length) > 0 && /*#__PURE__*/React.createElement(RemarkShow, _extends({}, remarkList[0], {
940
+ }))), (remarkList === null || remarkList === void 0 ? void 0 : remarkList.length) > 0 && !readonly && /*#__PURE__*/React.createElement(RemarkShow, _extends({}, remarkList[0], {
908
941
  handleOpenRemarkList: handleOpenRemarkList,
909
942
  handleOpenAddRemark: handleOpenAddRemark
910
943
  }))), getTag({
911
944
  nodeIsAuto: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no21 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no21 === void 0 ? void 0 : _currentNodeDetail$no21.isAuto,
912
945
  nodeType: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no22 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no22 === void 0 ? void 0 : _currentNodeDetail$no22.nodeType
913
- }) === 'artificial' && (!(currentNodeDetail !== null && currentNodeDetail !== void 0 && currentNodeDetail.workOrder) || isCurrentNodeHandler) && /*#__PURE__*/React.createElement("div", {
946
+ }) === 'artificial' && (!(currentNodeDetail !== null && currentNodeDetail !== void 0 && currentNodeDetail.workOrder) || isCurrentNodeHandler) && !readonly && /*#__PURE__*/React.createElement("div", {
914
947
  className: "footer"
915
948
  }, /*#__PURE__*/React.createElement(ActionList, {
916
949
  flowStatus: flowStatus,
package/dist/esm/FlowTemplateDetail/index.less CHANGED
@@ -22,7 +22,7 @@
22
22
  height: 8px;
23
23
  border-radius: 50%;
24
24
  }
25
-
25
+
26
26
  .PROCESSING {
27
27
  background-color: #FAAD14;
28
28
  }
@@ -44,6 +44,11 @@
44
44
  overflow-y: scroll;
45
45
  padding: 8px 0px;
46
46
  }
47
+
48
+ .readonly, .center {
49
+ height: 100%;
50
+ overflow-y: auto;
51
+ }
47
52
  .hasStatus {
48
53
  margin-top: -32px;
49
54
  padding-top: 32px;
package/dist/esm/common/utils/tools.js CHANGED
@@ -602,7 +602,7 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
602
602
  content: get(nowData, "".concat(item.uniqueKey, ".reason"), ''),
603
603
  name: item.name
604
604
  });
605
- } else if (['RETURN_GOODS_STATUS', 'EXCHANGE_STATUS', 'WAREHOUSING_STATUS', 'MSG_STATUS'].includes(item.workOrderComponentType)) {
605
+ } else if (['RETURN_GOODS_STATUS', 'EXCHANGE_STATUS', 'WAREHOUSING_STATUS'].includes(item.workOrderComponentType)) {
606
606
  var STATUS_LIST_MAP = {
607
607
  RETURN_GOODS_STATUS: {
608
608
  list: 'returnGoodsStatusList',
@@ -615,10 +615,6 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
615
615
  WAREHOUSING_STATUS: {
616
616
  list: 'inStockStatusItemList',
617
617
  status: 'inStockStatusList'
618
- },
619
- MSG_STATUS: {
620
- list: 'msgStatusValues',
621
- status: 'msgStatus4Search'
622
618
  }
623
619
  };
624
620
  contentVoList.push({
@@ -1255,14 +1251,13 @@ var transDataSource = function transDataSource(templateColumns) {
1255
1251
  status: item.jsonMap["".concat(nex.uniqueKey, "_").concat(STATUS_MAP[nex.workOrderComponentType].status)],
1256
1252
  reason: item.jsonMap["".concat(nex.uniqueKey, "_").concat(STATUS_MAP[nex.workOrderComponentType].reason)]
1257
1253
  }));
1258
- } else if (['RETURN_GOODS_STATUS', 'EXCHANGE_STATUS', 'WAREHOUSING_STATUS', 'MSG_STATUS'].includes(nex.workOrderComponentType)) {
1254
+ } else if (['RETURN_GOODS_STATUS', 'EXCHANGE_STATUS', 'WAREHOUSING_STATUS'].includes(nex.workOrderComponentType)) {
1259
1255
  var STATUS_LIST_MAP = {
1260
1256
  RETURN_GOODS_STATUS: 'returnGoodsStatusList',
1261
1257
  EXCHANGE_STATUS: 'exchangeReason',
1262
- WAREHOUSING_STATUS: 'inStockStatusItemList',
1263
- MSG_STATUS: 'msgStatusValues'
1258
+ WAREHOUSING_STATUS: 'inStockStatusItemList'
1264
1259
  };
1265
- return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_").concat(STATUS_LIST_MAP[nex.workOrderComponentType])], ['WAREHOUSING_STATUS', 'MSG_STATUS'].includes(nex.workOrderComponentType) ? [] : [{
1260
+ return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_").concat(STATUS_LIST_MAP[nex.workOrderComponentType])], nex.workOrderComponentType === 'WAREHOUSING_STATUS' ? [] : [{
1266
1261
  status: undefined,
1267
1262
  reason: '',
1268
1263
  systemOrderId: ''
package/dist/esm/model/flowTemplateDetail/index.js CHANGED
@@ -8,6 +8,7 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
8
8
  function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
9
9
  function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
10
10
  import { createSlice } from '@reduxjs/toolkit';
11
+ import { batch } from 'react-redux';
11
12
  import { last } from 'lodash';
12
13
  import { NodeType, PlatForm } from "./types";
13
14
  import { queryPanelInfo, queryAllFlowOperateRecord, currentTradeIdJoinWorkOrder, queryMultiNodeAssistantInfo } from "./api";
@@ -43,7 +44,7 @@ export var initialState = {
43
44
  export var fetchPanelInfo = function fetchPanelInfo(params, options) {
44
45
  return /*#__PURE__*/function () {
45
46
  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(dispatch) {
46
- var res, _res$data, _res$data$flowRecordL, _res$data2, _res$data2$currentNod, _res$data2$currentNod2, _last, _res$data3, _res$data4, _res$data5, _res$data6, _res$data7, _res$data8, _res$data9, _res$data10, _res$data11, _res$data12, _res$data13, _currentNodeDetail$wo, _currentNodeDetail$no, _res$data14, _currentNodeDetail$no2, recordList, _recordList, currentNodeDetail, handlerList, assistants, _res$data15, _currentNodeDetail$no3, assistantRes, _assistantRes$data;
47
+ var res, _res$data, _res$data$flowRecordL, _res$data2, _res$data2$currentNod, _res$data2$currentNod2, _last, _res$data13, _currentNodeDetail$wo, _currentNodeDetail$no, _res$data14, _currentNodeDetail$no2, recordList, _recordList, currentNodeDetail, handlerList, assistants, _res$data15, _currentNodeDetail$no3, assistantRes, _assistantRes$data;
47
48
  return _regeneratorRuntime().wrap(function _callee$(_context) {
48
49
  while (1) switch (_context.prev = _context.next) {
49
50
  case 0:
@@ -54,7 +55,7 @@ export var fetchPanelInfo = function fetchPanelInfo(params, options) {
54
55
  case 4:
55
56
  res = _context.sent;
56
57
  if (!res.success) {
57
- _context.next = 24;
58
+ _context.next = 17;
58
59
  break;
59
60
  }
60
61
  recordList = res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : (_res$data$flowRecordL = _res$data.flowRecordList) === null || _res$data$flowRecordL === void 0 ? void 0 : _res$data$flowRecordL.map(function (item) {
@@ -76,24 +77,26 @@ export var fetchPanelInfo = function fetchPanelInfo(params, options) {
76
77
  if ((res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : (_res$data2$currentNod = _res$data2.currentNodeDetail) === null || _res$data2$currentNod === void 0 ? void 0 : (_res$data2$currentNod2 = _res$data2$currentNod.nodeInfo) === null || _res$data2$currentNod2 === void 0 ? void 0 : _res$data2$currentNod2.id) === ((_last = last(recordList)) === null || _last === void 0 ? void 0 : _last.nodeId)) {
77
78
  recordList = (_recordList = recordList) === null || _recordList === void 0 ? void 0 : _recordList.slice(0, -1);
78
79
  }
79
- dispatch(setFlowList(recordList || []));
80
- dispatch(setTid((res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.tid) || ''));
81
- dispatch(setShopUniqueKey((res === null || res === void 0 ? void 0 : (_res$data4 = res.data) === null || _res$data4 === void 0 ? void 0 : _res$data4.shopUniqueKey) || ''));
82
- dispatch(setCurrentNode({
83
- currentNodeDetail: res === null || res === void 0 ? void 0 : (_res$data5 = res.data) === null || _res$data5 === void 0 ? void 0 : _res$data5.currentNodeDetail
84
- }));
85
- dispatch(setOperateParams({
86
- flowTemplateKey: res === null || res === void 0 ? void 0 : (_res$data6 = res.data) === null || _res$data6 === void 0 ? void 0 : _res$data6.flowTemplateKey,
87
- flowVersion: res === null || res === void 0 ? void 0 : (_res$data7 = res.data) === null || _res$data7 === void 0 ? void 0 : _res$data7.flowVersion,
88
- flowWorkOrderUpdateTime: res === null || res === void 0 ? void 0 : (_res$data8 = res.data) === null || _res$data8 === void 0 ? void 0 : _res$data8.flowWorkOrderUpdateTime,
89
- workOrderUpdateTime: res === null || res === void 0 ? void 0 : (_res$data9 = res.data) === null || _res$data9 === void 0 ? void 0 : _res$data9.workOrderUpdateTime
90
- }));
91
- dispatch(setFlowStatus(res === null || res === void 0 ? void 0 : (_res$data10 = res.data) === null || _res$data10 === void 0 ? void 0 : _res$data10.flowStatus));
92
- dispatch(setFlowTemplateId((res === null || res === void 0 ? void 0 : (_res$data11 = res.data) === null || _res$data11 === void 0 ? void 0 : _res$data11.flowTemplateId) || ''));
93
- dispatch(setCurrentFlowAllShowHideRules({
94
- allShowHideRules: res === null || res === void 0 ? void 0 : (_res$data12 = res.data) === null || _res$data12 === void 0 ? void 0 : _res$data12.allShowHideRules
95
- }));
96
-
80
+ batch(function () {
81
+ var _res$data3, _res$data4, _res$data5, _res$data6, _res$data7, _res$data8, _res$data9, _res$data10, _res$data11, _res$data12;
82
+ dispatch(setFlowList(recordList || []));
83
+ dispatch(setTid((res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.tid) || ''));
84
+ dispatch(setShopUniqueKey((res === null || res === void 0 ? void 0 : (_res$data4 = res.data) === null || _res$data4 === void 0 ? void 0 : _res$data4.shopUniqueKey) || ''));
85
+ dispatch(setCurrentNode({
86
+ currentNodeDetail: res === null || res === void 0 ? void 0 : (_res$data5 = res.data) === null || _res$data5 === void 0 ? void 0 : _res$data5.currentNodeDetail
87
+ }));
88
+ dispatch(setOperateParams({
89
+ flowTemplateKey: res === null || res === void 0 ? void 0 : (_res$data6 = res.data) === null || _res$data6 === void 0 ? void 0 : _res$data6.flowTemplateKey,
90
+ flowVersion: res === null || res === void 0 ? void 0 : (_res$data7 = res.data) === null || _res$data7 === void 0 ? void 0 : _res$data7.flowVersion,
91
+ flowWorkOrderUpdateTime: res === null || res === void 0 ? void 0 : (_res$data8 = res.data) === null || _res$data8 === void 0 ? void 0 : _res$data8.flowWorkOrderUpdateTime,
92
+ workOrderUpdateTime: res === null || res === void 0 ? void 0 : (_res$data9 = res.data) === null || _res$data9 === void 0 ? void 0 : _res$data9.workOrderUpdateTime
93
+ }));
94
+ dispatch(setFlowStatus(res === null || res === void 0 ? void 0 : (_res$data10 = res.data) === null || _res$data10 === void 0 ? void 0 : _res$data10.flowStatus));
95
+ dispatch(setFlowTemplateId((res === null || res === void 0 ? void 0 : (_res$data11 = res.data) === null || _res$data11 === void 0 ? void 0 : _res$data11.flowTemplateId) || ''));
96
+ dispatch(setCurrentFlowAllShowHideRules({
97
+ allShowHideRules: res === null || res === void 0 ? void 0 : (_res$data12 = res.data) === null || _res$data12 === void 0 ? void 0 : _res$data12.allShowHideRules
98
+ }));
99
+ });
97
100
  // 如果
98
101
  currentNodeDetail = res === null || res === void 0 ? void 0 : (_res$data13 = res.data) === null || _res$data13 === void 0 ? void 0 : _res$data13.currentNodeDetail;
99
102
  handlerList = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo === void 0 ? void 0 : _currentNodeDetail$wo.handlerList;
@@ -102,35 +105,35 @@ export var fetchPanelInfo = function fetchPanelInfo(params, options) {
102
105
  // 有处理人
103
106
  !(assistants !== null && assistants !== void 0 && assistants.isAllStaff) && // 不是所有人都能处理，查询能够处理的人
104
107
  res !== null && res !== void 0 && (_res$data14 = res.data) !== null && _res$data14 !== void 0 && _res$data14.flowTemplateId && currentNodeDetail !== null && currentNodeDetail !== void 0 && (_currentNodeDetail$no2 = currentNodeDetail.nodeInfo) !== null && _currentNodeDetail$no2 !== void 0 && _currentNodeDetail$no2.id)) {
105
- _context.next = 24;
108
+ _context.next = 17;
106
109
  break;
107
110
  }
108
- _context.next = 22;
111
+ _context.next = 15;
109
112
  return queryMultiNodeAssistantInfo([{
110
113
  flowTemplateId: res === null || res === void 0 ? void 0 : (_res$data15 = res.data) === null || _res$data15 === void 0 ? void 0 : _res$data15.flowTemplateId,
111
114
  currentNodeId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no3 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no3 === void 0 ? void 0 : _currentNodeDetail$no3.id
112
115
  }]);
113
- case 22:
116
+ case 15:
114
117
  assistantRes = _context.sent;
115
118
  if (assistantRes.success) {
116
119
  dispatch(setNodeAssistantInfo(_defineProperty({}, currentNodeDetail.nodeInfo.id, ((_assistantRes$data = assistantRes.data) === null || _assistantRes$data === void 0 ? void 0 : _assistantRes$data.userList) || [])));
117
120
  }
118
- case 24:
119
- _context.next = 29;
121
+ case 17:
122
+ _context.next = 22;
120
123
  break;
121
- case 26:
122
- _context.prev = 26;
124
+ case 19:
125
+ _context.prev = 19;
123
126
  _context.t0 = _context["catch"](0);
124
127
  console.error(_context.t0);
125
- case 29:
126
- _context.prev = 29;
128
+ case 22:
129
+ _context.prev = 22;
127
130
  dispatch(setLoading(false));
128
- return _context.finish(29);
129
- case 32:
131
+ return _context.finish(22);
132
+ case 25:
130
133
  case "end":
131
134
  return _context.stop();
132
135
  }
133
- }, _callee, null, [[0, 26, 29, 32]]);
136
+ }, _callee, null, [[0, 19, 22, 25]]);
134
137
  }));
135
138
  return function (_x) {
136
139
  return _ref.apply(this, arguments);
package/dist/esm/model/logicFlow/selector.d.ts CHANGED
@@ -6,7 +6,6 @@ export declare const selectFlowList: ((state: {
6
6
  paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
7
7
  singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
8
8
  logicFlow: import("./types").LogicFlowState;
9
- flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
10
9
  }) => import("./types").LogicFlow[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").LogicFlowState) => import("./types").LogicFlow[], {
11
10
  clearCache: () => void;
12
11
  }> & {
@@ -20,7 +19,6 @@ export declare const selectGroupFlowList: ((state: {
20
19
  paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
21
20
  singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
22
21
  logicFlow: import("./types").LogicFlowState;
23
- flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
24
22
  }) => import("./types").Option[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").LogicFlowState) => import("./types").Option[], {
25
23
  clearCache: () => void;
26
24
  }> & {
@@ -34,7 +32,6 @@ export declare const selectFlowTemplateGroupWorkOrderTemplateList: ((state: {
34
32
  paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
35
33
  singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
36
34
  logicFlow: import("./types").LogicFlowState;
37
- flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
38
35
  }) => import("./types").Option[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").LogicFlowState) => import("./types").Option[], {
39
36
  clearCache: () => void;
40
37
  }> & {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
3
- "version": "0.14.1-alpha.8",
3
+ "version": "0.14.1",
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": "^0.14.1-alpha.8",
36
- "@kmkf-fe-packages/kmkf-utils": "^0.13.1",
37
- "@kmkf-fe-packages/services-components": "^0.14.1-alpha.8",
35
+ "@kmkf-fe-packages/basic-components": "^0.14.1",
36
+ "@kmkf-fe-packages/kmkf-utils": "^0.14.1",
37
+ "@kmkf-fe-packages/services-components": "^0.14.1",
38
38
  "@reduxjs/toolkit": "^1.8.5",
39
39
  "ahooks": "^3.7.4",
40
40
  "copy-to-clipboard": "^3.3.3",
@@ -72,7 +72,7 @@
72
72
  "publishConfig": {
73
73
  "access": "public"
74
74
  },
75
- "gitHead": "c1057914dd1b41a6ca53a9dbc69417f70ce519f6",
75
+ "gitHead": "6cdf51565e497213b786f988ba694684a046d697",
76
76
  "gitHooks": {
77
77
  "pre-commit": "lint-staged"
78
78
  }