@kmkf-fe-packages/kmkf-work-order-service-component 0.13.0-beta.9 → 0.13.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.
- package/README.md +1 -1
- package/dist/esm/FlowTemplateDetail/common.js +16 -3
- package/dist/esm/FlowTemplateDetail/components/CurrentNode/index.d.ts +1 -0
- package/dist/esm/FlowTemplateDetail/components/CurrentNode/index.js +8 -4
- package/dist/esm/FlowTemplateDetail/components/FormRender/index.js +6 -4
- package/dist/esm/FlowTemplateDetail/components/Header/index.d.ts +3 -0
- package/dist/esm/FlowTemplateDetail/components/Header/index.js +20 -3
- package/dist/esm/FlowTemplateDetail/components/Item/index.js +2 -2
- package/dist/esm/FlowTemplateDetail/components/RemarkListModal/index.js +89 -5
- package/dist/esm/FlowTemplateDetail/index.js +98 -24
- package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/CustomizeWorkOrderCard/index.js +6 -0
- package/dist/esm/common/utils/tools.d.ts +1 -0
- package/dist/esm/common/utils/tools.js +67 -76
- package/dist/esm/model/flowTemplateDetail/api.d.ts +2 -0
- package/dist/esm/model/flowTemplateDetail/api.js +17 -0
- package/dist/esm/model/flowTemplateDetail/index.js +2 -2
- package/dist/esm/model/logicFlow/selector.d.ts +0 -3
- package/dist/esm/model/servers/api.d.ts +3 -0
- package/dist/esm/model/servers/api.js +8 -0
- package/package.json +5 -5
package/README.md
CHANGED
|
@@ -65,4 +65,4 @@ const Text = ()=>{
|
|
|
65
65
|
|
|
66
66
|
```
|
|
67
67
|
|
|
68
|
-
| 字段 | 说明 | 数据类型 | | ----------------- | ---------------- | ------------------------------------ | | platform | 平台 | TAOBAO =淘宝\|FXG=抖音\|PDD=拼多多\| | | shopId | 店铺 ID | number | | buyerNick | 买家昵称 | string | | buyerId | 买家 id | string | | orderNo | 订单 id | string | | onEmpowerCallback | 授权弹框点击回调 | function |
|
|
68
|
+
| 字段 | 说明 | 数据类型 | | ----------------- | ---------------- | ------------------------------------ | | platform | 平台 | TAOBAO =淘宝\|FXG=抖音\|PDD=拼多多\| | | shopId | 店铺 ID | number | | buyerNick | 买家昵称 | string | | buyerId | 买家 id | string | | orderNo | 订单 id | string | | onEmpowerCallback | 授权弹框点击回调 | function |
|
|
@@ -5,7 +5,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
|
|
|
5
5
|
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
|
|
6
6
|
function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
|
|
7
7
|
import { cloneDeep, isEqual, set, get } from 'lodash';
|
|
8
|
-
import { isNull } from '@kmkf-fe-packages/kmkf-utils';
|
|
8
|
+
import { isNull, unTransField } from '@kmkf-fe-packages/kmkf-utils';
|
|
9
9
|
import { submitDataTransOldFormat } from "../common/utils/tools";
|
|
10
10
|
import { NodeType, PlatForm } from "../model/flowTemplateDetail/types";
|
|
11
11
|
export var getTag = function getTag(item) {
|
|
@@ -40,7 +40,9 @@ export var getFlowOperate = {
|
|
|
40
40
|
REFUSE: '关闭',
|
|
41
41
|
REMARK: '备注',
|
|
42
42
|
MODIFY_WORK_ORDER: '修改',
|
|
43
|
-
WITHDRAW: '撤回'
|
|
43
|
+
WITHDRAW: '撤回',
|
|
44
|
+
REMINDER: '催单',
|
|
45
|
+
CANCEL_REMINDER: '取消催单'
|
|
44
46
|
};
|
|
45
47
|
export var FLOW_STATUS_V2 = {
|
|
46
48
|
WAIT_COMMIT: '待提交',
|
|
@@ -98,7 +100,18 @@ export var submitParams = function submitParams(_ref) {
|
|
|
98
100
|
var updateList = submitData === null || submitData === void 0 ? void 0 : submitData.reduce(function (cur, nxt) {
|
|
99
101
|
var _nxt$contentList;
|
|
100
102
|
nxt === null || nxt === void 0 ? void 0 : (_nxt$contentList = nxt.contentList) === null || _nxt$contentList === void 0 ? void 0 : _nxt$contentList.map(function (item) {
|
|
101
|
-
|
|
103
|
+
var newOldContent = cloneDeep(item.oldContent);
|
|
104
|
+
if (unTransField(item.uniqueKey)) {
|
|
105
|
+
try {
|
|
106
|
+
newOldContent = JSON.parse(newOldContent);
|
|
107
|
+
} catch (e) {
|
|
108
|
+
console.error('error');
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
if (isNull(newOldContent) && isNull(item.content)) return;
|
|
112
|
+
if (newOldContent == item.content) return;
|
|
113
|
+
if (!isEqual(newOldContent, item.content)) {
|
|
114
|
+
// console.log(item.name, item.uniqueKey, newOldContent, item.content);
|
|
102
115
|
cur.push({
|
|
103
116
|
dataKey: item.uniqueKey,
|
|
104
117
|
name: item.name,
|
|
@@ -6,6 +6,7 @@ declare type CurrentNodeProps = {
|
|
|
6
6
|
defaultShopId?: string;
|
|
7
7
|
onOpenWangWang?: (nick: string, id: string) => void;
|
|
8
8
|
onUpdateRemark?: (remark: string, flag: string) => void;
|
|
9
|
+
onReminder?: (type: string) => void;
|
|
9
10
|
};
|
|
10
11
|
declare const CurrentNode: (props: CurrentNodeProps) => React.JSX.Element;
|
|
11
12
|
export default CurrentNode;
|
|
@@ -13,7 +13,7 @@ import { useSelector, useDispatch } from 'react-redux';
|
|
|
13
13
|
import { calcWorkOrderList } from "../../../common/utils/tools";
|
|
14
14
|
import { selectCurrentNodeDetail, selectTid, selectPlatInfo, selectFlowStatus, selectOperateParams, selectCurrentFlowAllShowHideRules, selectNodeAssistantMap } from "../../../model/flowTemplateDetail/selector";
|
|
15
15
|
import { setCurrentTradeIdWOrkOrderNumber, fetchCurrentTradeIdLinkWorkOrder, setAction, setWithdrawWorkOrderDetail } from "../../../model/flowTemplateDetail";
|
|
16
|
-
import { FlowStatus, NodeType } from "../../../model/flowTemplateDetail/types";
|
|
16
|
+
import { FlowStatus, NodeType, NodeStatus } from "../../../model/flowTemplateDetail/types";
|
|
17
17
|
import Header from "../Header";
|
|
18
18
|
import FormRender from "../FormRender";
|
|
19
19
|
import RenderDetail from "../RenderDetail";
|
|
@@ -21,11 +21,12 @@ import { getTag, currentUserHasOperatorAuth } from "../../common";
|
|
|
21
21
|
import styles from "./index.module.less";
|
|
22
22
|
import { PlatForm } from "../../../WorkOrder/types";
|
|
23
23
|
var CurrentNode = function CurrentNode(props) {
|
|
24
|
-
var _currentNodeDetail$no, _currentNodeDetail$no2, _currentNodeDetail$no3, _currentNodeDetail$no4, _currentNodeDetail$wo8, _currentNodeDetail$wo9, _currentNodeDetail$wo10, _currentNodeDetail$wo11, _currentNodeDetail$no17, _currentNodeDetail$no18, _currentNodeDetail$
|
|
24
|
+
var _currentNodeDetail$no, _currentNodeDetail$no2, _currentNodeDetail$no3, _currentNodeDetail$no4, _currentNodeDetail$wo8, _currentNodeDetail$wo9, _currentNodeDetail$wo10, _currentNodeDetail$wo11, _currentNodeDetail$wo12, _currentNodeDetail$wo13, _currentNodeDetail$wo14, _currentNodeDetail$no17, _currentNodeDetail$no18, _currentNodeDetail$wo15;
|
|
25
25
|
var shopList = props.shopList,
|
|
26
26
|
form = props.form,
|
|
27
27
|
onOpenWangWang = props.onOpenWangWang,
|
|
28
28
|
onUpdateRemark = props.onUpdateRemark,
|
|
29
|
+
onReminder = props.onReminder,
|
|
29
30
|
defaultShopId = props.defaultShopId;
|
|
30
31
|
var dispatch = useDispatch();
|
|
31
32
|
var currentNodeDetail = useSelector(selectCurrentNodeDetail);
|
|
@@ -128,7 +129,10 @@ var CurrentNode = function CurrentNode(props) {
|
|
|
128
129
|
showLook: false,
|
|
129
130
|
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 : '',
|
|
130
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,
|
|
131
|
-
|
|
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
|
+
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
|
+
handleWithdraw: handleWithdraw,
|
|
135
|
+
handleReminder: onReminder
|
|
132
136
|
}), /*#__PURE__*/React.createElement("div", {
|
|
133
137
|
className: styles.formRenderContainer
|
|
134
138
|
}, [NodeType.START_NODE, NodeType.EXECUTE_NODE].includes(currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no17 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no17 === void 0 ? void 0 : _currentNodeDetail$no17.nodeType) && (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo) && (flowStatus === FlowStatus.COMPLETED ? /*#__PURE__*/React.createElement(RenderDetail, {
|
|
@@ -142,7 +146,7 @@ var CurrentNode = function CurrentNode(props) {
|
|
|
142
146
|
templateDetail: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo,
|
|
143
147
|
shopList: shopList,
|
|
144
148
|
record: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrder,
|
|
145
|
-
shopId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
149
|
+
shopId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo15 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo15 === void 0 ? void 0 : _currentNodeDetail$wo15.shopId) || plat.shopId || defaultShopId,
|
|
146
150
|
accountName: plat === null || plat === void 0 ? void 0 : plat.accountName,
|
|
147
151
|
onOpenWangWang: onOpenWangWang,
|
|
148
152
|
onUpdateRemark: onUpdateRemark,
|
|
@@ -639,9 +639,9 @@ var FormRender = function FormRender(props) {
|
|
|
639
639
|
var newComponentConfig = _objectSpread(_objectSpread({}, componentConfig), {}, {
|
|
640
640
|
disabled: disabled
|
|
641
641
|
});
|
|
642
|
-
if (workOrderComponentType === 'PICTURE') {
|
|
643
|
-
|
|
644
|
-
}
|
|
642
|
+
// if (workOrderComponentType === 'PICTURE') {
|
|
643
|
+
// newComponentConfig['canPreview'] = disabled;
|
|
644
|
+
// }
|
|
645
645
|
if (workOrderComponentType === 'ENTERPRISE_PAYMENT') {
|
|
646
646
|
newComponentConfig['disabled'] = disabled || !canModifyPayment;
|
|
647
647
|
}
|
|
@@ -665,7 +665,9 @@ var FormRender = function FormRender(props) {
|
|
|
665
665
|
effects: _objectSpread(_objectSpread({}, others), {}, {
|
|
666
666
|
env: plat.platform
|
|
667
667
|
}),
|
|
668
|
-
type: workOrderComponentType
|
|
668
|
+
type: workOrderComponentType,
|
|
669
|
+
templateId: templateDetail.uniqueKey,
|
|
670
|
+
workOrderUniqueKey: record === null || record === void 0 ? void 0 : record.id
|
|
669
671
|
});
|
|
670
672
|
currentTemplateAllComponentsDisplay.current[instance === null || instance === void 0 ? void 0 : instance.id] = true;
|
|
671
673
|
if (Reflect.has(idConditionListMap, instance.id)) {
|
|
@@ -5,15 +5,18 @@ interface HeaderProps {
|
|
|
5
5
|
showLook: boolean;
|
|
6
6
|
showEdit: boolean;
|
|
7
7
|
showWithdraw: boolean;
|
|
8
|
+
showReminder?: boolean;
|
|
8
9
|
handleLook?: () => void;
|
|
9
10
|
handleSave?: () => void;
|
|
10
11
|
handleEdit?: () => void;
|
|
11
12
|
handlePackUp?: () => void;
|
|
12
13
|
handleWithdraw?: () => void;
|
|
14
|
+
handleReminder?: (type: string) => void;
|
|
13
15
|
loading?: boolean;
|
|
14
16
|
editing?: boolean;
|
|
15
17
|
opening?: boolean;
|
|
16
18
|
handler?: string;
|
|
19
|
+
isReminder?: string;
|
|
17
20
|
}
|
|
18
21
|
declare const Header: (props: HeaderProps) => React.JSX.Element;
|
|
19
22
|
export default Header;
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
import { Button, Spin, Tooltip } from 'antd';
|
|
2
|
+
import { Button, Spin, Tooltip, Typography } from 'antd';
|
|
3
3
|
import { NODE_TYPE } from "../../../common/constant";
|
|
4
4
|
import styles from "./index.module.less";
|
|
5
|
+
var Text = Typography.Text;
|
|
5
6
|
var Header = function Header(props) {
|
|
6
7
|
var _NODE_TYPE$tag, _NODE_TYPE$tag2;
|
|
7
8
|
var tag = props.tag,
|
|
@@ -13,6 +14,7 @@ var Header = function Header(props) {
|
|
|
13
14
|
handleSave = props.handleSave,
|
|
14
15
|
handlePackUp = props.handlePackUp,
|
|
15
16
|
handleWithdraw = props.handleWithdraw,
|
|
17
|
+
handleReminder = props.handleReminder,
|
|
16
18
|
_props$loading = props.loading,
|
|
17
19
|
loading = _props$loading === void 0 ? false : _props$loading,
|
|
18
20
|
_props$editing = props.editing,
|
|
@@ -21,7 +23,10 @@ var Header = function Header(props) {
|
|
|
21
23
|
opening = _props$opening === void 0 ? false : _props$opening,
|
|
22
24
|
_props$showWithdraw = props.showWithdraw,
|
|
23
25
|
showWithdraw = _props$showWithdraw === void 0 ? false : _props$showWithdraw,
|
|
24
|
-
|
|
26
|
+
_props$showReminder = props.showReminder,
|
|
27
|
+
showReminder = _props$showReminder === void 0 ? false : _props$showReminder,
|
|
28
|
+
handler = props.handler,
|
|
29
|
+
isReminder = props.isReminder;
|
|
25
30
|
return /*#__PURE__*/React.createElement("div", {
|
|
26
31
|
className: styles.wrap
|
|
27
32
|
}, (NODE_TYPE === null || NODE_TYPE === void 0 ? void 0 : NODE_TYPE[tag]) && /*#__PURE__*/React.createElement("div", {
|
|
@@ -58,6 +63,18 @@ var Header = function Header(props) {
|
|
|
58
63
|
onClick: function onClick() {
|
|
59
64
|
return typeof handleLook === 'function' && handleLook();
|
|
60
65
|
}
|
|
61
|
-
}, "\u8BE6\u60C5"))
|
|
66
|
+
}, "\u8BE6\u60C5")), showReminder && /*#__PURE__*/React.createElement(React.Fragment, null, !isReminder ? /*#__PURE__*/React.createElement(Button, {
|
|
67
|
+
type: "link",
|
|
68
|
+
onClick: function onClick() {
|
|
69
|
+
return typeof handleReminder === 'function' && handleReminder('reminder');
|
|
70
|
+
}
|
|
71
|
+
}, "\u50AC\u5355") : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Text, {
|
|
72
|
+
type: "success"
|
|
73
|
+
}, "\u5DF2\u50AC\u5355"), /*#__PURE__*/React.createElement(Button, {
|
|
74
|
+
type: "link",
|
|
75
|
+
onClick: function onClick() {
|
|
76
|
+
return typeof handleReminder === 'function' && handleReminder('cancelReminder');
|
|
77
|
+
}
|
|
78
|
+
}, "\u53D6\u6D88")))));
|
|
62
79
|
};
|
|
63
80
|
export default Header;
|
|
@@ -196,8 +196,8 @@ var NodeItem = function NodeItem(props) {
|
|
|
196
196
|
}));
|
|
197
197
|
dispatch(setAction('withdraw'));
|
|
198
198
|
};
|
|
199
|
-
//
|
|
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.
|
|
199
|
+
// 人工节点+打开状态+当前工单提交人是当前完成人+状态是待处理
|
|
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;
|
|
201
201
|
|
|
202
202
|
// 是否是当前节点处理人
|
|
203
203
|
var isCurrentNodeHandler = useMemo(function () {
|
|
@@ -1,15 +1,35 @@
|
|
|
1
|
-
|
|
1
|
+
function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
|
|
2
|
+
function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
|
|
3
|
+
function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
|
|
4
|
+
function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
5
|
+
function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
|
|
6
|
+
function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
|
|
7
|
+
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); } }
|
|
8
|
+
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); }); }; }
|
|
9
|
+
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
|
|
10
|
+
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."); }
|
|
11
|
+
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); }
|
|
12
|
+
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
|
|
13
|
+
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; } }
|
|
14
|
+
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
15
|
+
import React, { useEffect, useState } from 'react';
|
|
2
16
|
import { Modal, Timeline } from 'antd';
|
|
3
17
|
import { useSelector, useDispatch } from 'react-redux';
|
|
18
|
+
import { cloneDeep } from 'lodash';
|
|
4
19
|
import { selectVisibleRemarkList, selectRemarkRecordList } from "../../../model/flowTemplateDetail/selector";
|
|
5
20
|
import { setVisibleRemarkList } from "../../../model/flowTemplateDetail";
|
|
21
|
+
import { listTemplateDetail } from "../../../model/servers/api";
|
|
6
22
|
import { getFlowOperate } from "../../common";
|
|
23
|
+
import { OperationLog } from '@kmkf-fe-packages/services-components';
|
|
7
24
|
import styles from "./index.module.less";
|
|
8
25
|
var Record = function Record(props) {
|
|
9
26
|
var time = props.time,
|
|
10
27
|
operator = props.operator,
|
|
11
28
|
context = props.context,
|
|
12
|
-
operatorType = props.operatorType
|
|
29
|
+
operatorType = props.operatorType,
|
|
30
|
+
nodeName = props.nodeName,
|
|
31
|
+
workOrderUpdateLog = props.workOrderUpdateLog,
|
|
32
|
+
componentDtoList = props.componentDtoList;
|
|
13
33
|
return /*#__PURE__*/React.createElement("div", {
|
|
14
34
|
className: styles.remarkContext
|
|
15
35
|
}, /*#__PURE__*/React.createElement("div", {
|
|
@@ -20,17 +40,81 @@ var Record = function Record(props) {
|
|
|
20
40
|
className: styles.operator
|
|
21
41
|
}, operator), operatorType && /*#__PURE__*/React.createElement("span", {
|
|
22
42
|
className: styles.tag
|
|
23
|
-
}, getFlowOperate === null || getFlowOperate === void 0 ? void 0 : getFlowOperate[operatorType]))), /*#__PURE__*/React.createElement("div", {
|
|
43
|
+
}, getFlowOperate === null || getFlowOperate === void 0 ? void 0 : getFlowOperate[operatorType]))), /*#__PURE__*/React.createElement("div", null, "\u8282\u70B9\uFF1A", nodeName), /*#__PURE__*/React.createElement("div", {
|
|
24
44
|
className: styles.context
|
|
25
|
-
}, context)
|
|
45
|
+
}, context), workOrderUpdateLog ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(OperationLog, {
|
|
46
|
+
content: workOrderUpdateLog.content,
|
|
47
|
+
operation: workOrderUpdateLog.operation,
|
|
48
|
+
componentDtoList: componentDtoList
|
|
49
|
+
})) : null);
|
|
26
50
|
};
|
|
27
51
|
var RemarkListModal = function RemarkListModal() {
|
|
28
52
|
var visible = useSelector(selectVisibleRemarkList);
|
|
29
53
|
var list = useSelector(selectRemarkRecordList);
|
|
54
|
+
var _useState = useState([]),
|
|
55
|
+
_useState2 = _slicedToArray(_useState, 2),
|
|
56
|
+
remarkList = _useState2[0],
|
|
57
|
+
setRemarkList = _useState2[1];
|
|
30
58
|
var dispatch = useDispatch();
|
|
31
59
|
var closeModal = function closeModal() {
|
|
32
60
|
dispatch(setVisibleRemarkList(false));
|
|
33
61
|
};
|
|
62
|
+
useEffect(function () {
|
|
63
|
+
if (visible && list !== null && list !== void 0 && list.length) {
|
|
64
|
+
getTemplateList(list);
|
|
65
|
+
}
|
|
66
|
+
}, [visible, list]);
|
|
67
|
+
var getTemplateList = /*#__PURE__*/function () {
|
|
68
|
+
var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(list) {
|
|
69
|
+
var newList, templateUniqueKeyList, _yield$listTemplateDe, data;
|
|
70
|
+
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
71
|
+
while (1) switch (_context.prev = _context.next) {
|
|
72
|
+
case 0:
|
|
73
|
+
newList = cloneDeep(list);
|
|
74
|
+
templateUniqueKeyList = list.reduce(function (prv, next) {
|
|
75
|
+
var _next$workOrderUpdate;
|
|
76
|
+
if (next !== null && next !== void 0 && (_next$workOrderUpdate = next.workOrderUpdateLog) !== null && _next$workOrderUpdate !== void 0 && _next$workOrderUpdate.templateId) {
|
|
77
|
+
var _next$workOrderUpdate2;
|
|
78
|
+
prv.push(next === null || next === void 0 ? void 0 : (_next$workOrderUpdate2 = next.workOrderUpdateLog) === null || _next$workOrderUpdate2 === void 0 ? void 0 : _next$workOrderUpdate2.templateId);
|
|
79
|
+
}
|
|
80
|
+
return prv;
|
|
81
|
+
}, []);
|
|
82
|
+
if (!templateUniqueKeyList.length) {
|
|
83
|
+
_context.next = 8;
|
|
84
|
+
break;
|
|
85
|
+
}
|
|
86
|
+
_context.next = 5;
|
|
87
|
+
return listTemplateDetail({
|
|
88
|
+
templateUniqueKeyList: templateUniqueKeyList
|
|
89
|
+
});
|
|
90
|
+
case 5:
|
|
91
|
+
_yield$listTemplateDe = _context.sent;
|
|
92
|
+
data = _yield$listTemplateDe.data;
|
|
93
|
+
newList.forEach(function (item) {
|
|
94
|
+
var tempItem = data.find(function (t) {
|
|
95
|
+
var _item$workOrderUpdate;
|
|
96
|
+
return (item === null || item === void 0 ? void 0 : (_item$workOrderUpdate = item.workOrderUpdateLog) === null || _item$workOrderUpdate === void 0 ? void 0 : _item$workOrderUpdate.templateId) === t.uniqueKey;
|
|
97
|
+
});
|
|
98
|
+
if (tempItem) {
|
|
99
|
+
item.componentDtoList = [].concat(_toConsumableArray(tempItem.componentDtoList), [{
|
|
100
|
+
name: '标记',
|
|
101
|
+
workOrderComponentType: 'FLOW_MARK_SELECT',
|
|
102
|
+
uniqueKey: 'markFlag'
|
|
103
|
+
}]);
|
|
104
|
+
}
|
|
105
|
+
});
|
|
106
|
+
case 8:
|
|
107
|
+
setRemarkList(newList);
|
|
108
|
+
case 9:
|
|
109
|
+
case "end":
|
|
110
|
+
return _context.stop();
|
|
111
|
+
}
|
|
112
|
+
}, _callee);
|
|
113
|
+
}));
|
|
114
|
+
return function getTemplateList(_x2) {
|
|
115
|
+
return _ref.apply(this, arguments);
|
|
116
|
+
};
|
|
117
|
+
}();
|
|
34
118
|
return /*#__PURE__*/React.createElement(Modal, {
|
|
35
119
|
title: "\u8BB0\u5F55",
|
|
36
120
|
visible: visible,
|
|
@@ -40,7 +124,7 @@ var RemarkListModal = function RemarkListModal() {
|
|
|
40
124
|
maxHeight: '500px',
|
|
41
125
|
overflow: 'auto'
|
|
42
126
|
}
|
|
43
|
-
}, /*#__PURE__*/React.createElement(Timeline, null,
|
|
127
|
+
}, /*#__PURE__*/React.createElement(Timeline, null, remarkList === null || remarkList === void 0 ? void 0 : remarkList.map(function (flowRecord) {
|
|
44
128
|
return /*#__PURE__*/React.createElement(Timeline.Item, null, /*#__PURE__*/React.createElement(Record, flowRecord));
|
|
45
129
|
})));
|
|
46
130
|
};
|
|
@@ -15,7 +15,6 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
|
|
|
15
15
|
function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
|
|
16
16
|
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
17
17
|
import React, { useEffect, useState, useRef, useMemo } from 'react';
|
|
18
|
-
import Request from 'umi-request';
|
|
19
18
|
import { Timeline, ConfigProvider, Form, message, Alert, Button, Spin } from 'antd';
|
|
20
19
|
import { get, find, isEmpty } from 'lodash';
|
|
21
20
|
import { useDispatch, useSelector, Provider } from 'react-redux';
|
|
@@ -40,15 +39,11 @@ import RemarkModal from "./components/RemarkModal";
|
|
|
40
39
|
import WithdrawModal from "./components/WithdrawModal";
|
|
41
40
|
import { useSignal } from "../hooks/useSignal";
|
|
42
41
|
import { verifyHandle, submitParams, FLOW_STATUS_V2, getTag, currentUserHasOperatorAuth } from "./common";
|
|
43
|
-
import { saveWorkOrder, submitWorkOrder, addRemark, stopWorkOrder, closeWorkOrder, startWorkOrder, forwardWorkOrder, returnWorkOrder, withDrawWorkOrder } from "../model/flowTemplateDetail/api";
|
|
42
|
+
import { saveWorkOrder, submitWorkOrder, addRemark, stopWorkOrder, closeWorkOrder, startWorkOrder, forwardWorkOrder, returnWorkOrder, withDrawWorkOrder, reminder, cancelReminder } from "../model/flowTemplateDetail/api";
|
|
44
43
|
import { orderDetail } from "../model/servers/api";
|
|
45
44
|
import "./index.less";
|
|
46
|
-
var CancelToken = Request.CancelToken;
|
|
47
|
-
var _CancelToken$source = CancelToken.source(),
|
|
48
|
-
token = _CancelToken$source.token,
|
|
49
|
-
cancel = _CancelToken$source.cancel;
|
|
50
45
|
var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
51
|
-
var _currentNodeDetail$wo, _currentNodeDetail$no, _currentNodeDetail$wo2, _shopList$find, _currentNodeDetail$
|
|
46
|
+
var _currentNodeDetail$wo, _currentNodeDetail$no, _currentNodeDetail$wo2, _shopList$find, _currentNodeDetail$no21, _currentNodeDetail$no22, _currentNodeDetail$no23;
|
|
52
47
|
var flowTemplateKey = props.flowTemplateKey,
|
|
53
48
|
_props$shopList = props.shopList,
|
|
54
49
|
shopList = _props$shopList === void 0 ? [] : _props$shopList,
|
|
@@ -192,7 +187,6 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
192
187
|
return function () {
|
|
193
188
|
form.resetFields();
|
|
194
189
|
dispatch(setClearStore());
|
|
195
|
-
cancel();
|
|
196
190
|
};
|
|
197
191
|
}, []);
|
|
198
192
|
|
|
@@ -736,10 +730,89 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
736
730
|
return _ref9.apply(this, arguments);
|
|
737
731
|
};
|
|
738
732
|
}();
|
|
733
|
+
//催单
|
|
734
|
+
var handleReminder = /*#__PURE__*/function () {
|
|
735
|
+
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;
|
|
737
|
+
return _regeneratorRuntime().wrap(function _callee10$(_context10) {
|
|
738
|
+
while (1) switch (_context10.prev = _context10.next) {
|
|
739
|
+
case 0:
|
|
740
|
+
_context10.prev = 0;
|
|
741
|
+
dispatch(setLoading(true));
|
|
742
|
+
api = type === 'reminder' ? reminder : cancelReminder;
|
|
743
|
+
flowTags = JSON.parse((currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo16 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo16 === void 0 ? void 0 : (_currentNodeDetail$wo17 = _currentNodeDetail$wo16.jsonMap) === null || _currentNodeDetail$wo17 === void 0 ? void 0 : _currentNodeDetail$wo17.flowTags) || '[]');
|
|
744
|
+
newFlowTags = type === 'reminder' ? flowTags.concat('REMINDER') : flowTags.filter(function (t) {
|
|
745
|
+
return t !== 'REMINDER';
|
|
746
|
+
});
|
|
747
|
+
params = {
|
|
748
|
+
updateInfo: {
|
|
749
|
+
nodeId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no9 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no9 === void 0 ? void 0 : _currentNodeDetail$no9.id,
|
|
750
|
+
templateId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo18 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo18 === void 0 ? void 0 : _currentNodeDetail$wo18.templateId,
|
|
751
|
+
workOrderId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo19 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo19 === void 0 ? void 0 : _currentNodeDetail$wo19.id,
|
|
752
|
+
updateList: [{
|
|
753
|
+
dataKey: 'flowTags',
|
|
754
|
+
name: '标签',
|
|
755
|
+
dataValue: newFlowTags,
|
|
756
|
+
oldValue: JSON.parse((currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo20 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo20 === void 0 ? void 0 : (_currentNodeDetail$wo21 = _currentNodeDetail$wo20.jsonMap) === null || _currentNodeDetail$wo21 === void 0 ? void 0 : _currentNodeDetail$wo21.flowTags) || '[]')
|
|
757
|
+
}],
|
|
758
|
+
updateTime: operateParams === null || operateParams === void 0 ? void 0 : operateParams.workOrderUpdateTime,
|
|
759
|
+
needTransForm: false
|
|
760
|
+
},
|
|
761
|
+
operateParams: {
|
|
762
|
+
nodeId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no10 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no10 === void 0 ? void 0 : _currentNodeDetail$no10.id,
|
|
763
|
+
flowWorkOrderId: flowWorkOrderIdState,
|
|
764
|
+
workOrderId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo22 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo22 === void 0 ? void 0 : _currentNodeDetail$wo22.id,
|
|
765
|
+
flowTemplateId: flowTemplateId,
|
|
766
|
+
workOrderUpdateTime: operateParams === null || operateParams === void 0 ? void 0 : operateParams.workOrderUpdateTime,
|
|
767
|
+
flowWorkOrderUpdateTime: operateParams === null || operateParams === void 0 ? void 0 : operateParams.flowWorkOrderUpdateTime
|
|
768
|
+
}
|
|
769
|
+
}; // console.log(params);
|
|
770
|
+
// return;
|
|
771
|
+
_context10.next = 8;
|
|
772
|
+
return api(params);
|
|
773
|
+
case 8:
|
|
774
|
+
res = _context10.sent;
|
|
775
|
+
if (res.success) {
|
|
776
|
+
handleSuccessCallBack(type);
|
|
777
|
+
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
|
+
}));
|
|
788
|
+
} else {
|
|
789
|
+
message.error(res.message);
|
|
790
|
+
}
|
|
791
|
+
_context10.next = 15;
|
|
792
|
+
break;
|
|
793
|
+
case 12:
|
|
794
|
+
_context10.prev = 12;
|
|
795
|
+
_context10.t0 = _context10["catch"](0);
|
|
796
|
+
console.log(type === 'reminder' ? '催单成功' : '取消催单成功', _context10.t0);
|
|
797
|
+
case 15:
|
|
798
|
+
_context10.prev = 15;
|
|
799
|
+
dispatch(setLoading(false));
|
|
800
|
+
return _context10.finish(15);
|
|
801
|
+
case 18:
|
|
802
|
+
case "end":
|
|
803
|
+
return _context10.stop();
|
|
804
|
+
}
|
|
805
|
+
}, _callee10, null, [[0, 12, 15, 18]]);
|
|
806
|
+
}));
|
|
807
|
+
return function handleReminder(_x8) {
|
|
808
|
+
return _ref10.apply(this, arguments);
|
|
809
|
+
};
|
|
810
|
+
}();
|
|
811
|
+
|
|
739
812
|
// 填充表单
|
|
740
813
|
var handleFillWorkOrder = function handleFillWorkOrder() {
|
|
741
|
-
var _currentNodeDetail$
|
|
742
|
-
var transData = calcWorkOrderList([currentTradeIdLinkWorkOrderId === null || currentTradeIdLinkWorkOrderId === void 0 ? void 0 : currentTradeIdLinkWorkOrderId.lastWorkOrderDetail], (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
814
|
+
var _currentNodeDetail$wo23;
|
|
815
|
+
var transData = calcWorkOrderList([currentTradeIdLinkWorkOrderId === null || currentTradeIdLinkWorkOrderId === void 0 ? void 0 : currentTradeIdLinkWorkOrderId.lastWorkOrderDetail], (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo23 = currentNodeDetail.workOrderTemplateInfo) === null || _currentNodeDetail$wo23 === void 0 ? void 0 : _currentNodeDetail$wo23.componentDtoList) || []);
|
|
743
816
|
var formData = form.getFieldsValue();
|
|
744
817
|
form.setFieldsValue(_objectSpread(_objectSpread({}, formData), get(transData, '0', {})));
|
|
745
818
|
};
|
|
@@ -752,12 +825,12 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
752
825
|
};
|
|
753
826
|
useEffect(function () {
|
|
754
827
|
if (flowTemplateKey) {
|
|
755
|
-
var _controllerRef$
|
|
828
|
+
var _controllerRef$curren9;
|
|
756
829
|
dispatch(fetchPanelInfo({
|
|
757
830
|
flowTemplateKey: flowTemplateKey,
|
|
758
831
|
flowWorkOrderId: flowWorkOrderIdState
|
|
759
832
|
}, {
|
|
760
|
-
signal: controllerRef === null || controllerRef === void 0 ? void 0 : (_controllerRef$
|
|
833
|
+
signal: controllerRef === null || controllerRef === void 0 ? void 0 : (_controllerRef$curren9 = controllerRef.current) === null || _controllerRef$curren9 === void 0 ? void 0 : _controllerRef$curren9.signal
|
|
761
834
|
}));
|
|
762
835
|
}
|
|
763
836
|
}, [flowTemplateKey, flowWorkOrderIdState]);
|
|
@@ -776,19 +849,19 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
776
849
|
initHandle();
|
|
777
850
|
}, []);
|
|
778
851
|
var isCurrentNodeHandler = useMemo(function () {
|
|
779
|
-
var _currentNodeDetail$
|
|
852
|
+
var _currentNodeDetail$no11, _currentNodeDetail$no12, _currentNodeDetail$no13, _currentNodeDetail$no14, _currentNodeDetail$no15, _currentNodeDetail$no16, _currentNodeDetail$wo24, _currentNodeDetail$no17, _currentNodeDetail$no18;
|
|
780
853
|
return currentUserHasOperatorAuth({
|
|
781
|
-
assistantList: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
854
|
+
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] || [],
|
|
782
855
|
currentUserKey: plat.userKey,
|
|
783
|
-
staffIds: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
784
|
-
operateDataPermission: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
785
|
-
handlerList: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
786
|
-
isAllStaff: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
856
|
+
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) || [],
|
|
857
|
+
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,
|
|
858
|
+
handlerList: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo24 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo24 === void 0 ? void 0 : _currentNodeDetail$wo24.handlerList) || [],
|
|
859
|
+
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
|
|
787
860
|
});
|
|
788
861
|
}, [currentNodeDetail, plat, assistantMap]);
|
|
789
862
|
var defaultShopId = (_shopList$find = shopList.find(function (item) {
|
|
790
|
-
var _currentNodeDetail$
|
|
791
|
-
return item.accessToken === (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
863
|
+
var _currentNodeDetail$no19, _currentNodeDetail$no20;
|
|
864
|
+
return item.accessToken === (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no19 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no19 === void 0 ? void 0 : (_currentNodeDetail$no20 = _currentNodeDetail$no19.relationEvent) === null || _currentNodeDetail$no20 === void 0 ? void 0 : _currentNodeDetail$no20.defaultShopUniqueKey);
|
|
792
865
|
})) === null || _shopList$find === void 0 ? void 0 : _shopList$find.shopId;
|
|
793
866
|
return /*#__PURE__*/React.createElement(Spin, {
|
|
794
867
|
spinning: loading
|
|
@@ -829,13 +902,14 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
829
902
|
form: form,
|
|
830
903
|
defaultShopId: defaultShopId,
|
|
831
904
|
onOpenWangWang: onOpenWangWang,
|
|
832
|
-
onUpdateRemark: onUpdateRemark
|
|
905
|
+
onUpdateRemark: onUpdateRemark,
|
|
906
|
+
onReminder: handleReminder
|
|
833
907
|
}))), (remarkList === null || remarkList === void 0 ? void 0 : remarkList.length) > 0 && /*#__PURE__*/React.createElement(RemarkShow, _extends({}, remarkList[0], {
|
|
834
908
|
handleOpenRemarkList: handleOpenRemarkList,
|
|
835
909
|
handleOpenAddRemark: handleOpenAddRemark
|
|
836
910
|
}))), getTag({
|
|
837
|
-
nodeIsAuto: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
838
|
-
nodeType: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
911
|
+
nodeIsAuto: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no21 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no21 === void 0 ? void 0 : _currentNodeDetail$no21.isAuto,
|
|
912
|
+
nodeType: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no22 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no22 === void 0 ? void 0 : _currentNodeDetail$no22.nodeType
|
|
839
913
|
}) === 'artificial' && (!(currentNodeDetail !== null && currentNodeDetail !== void 0 && currentNodeDetail.workOrder) || isCurrentNodeHandler) && /*#__PURE__*/React.createElement("div", {
|
|
840
914
|
className: "footer"
|
|
841
915
|
}, /*#__PURE__*/React.createElement(ActionList, {
|
|
@@ -854,7 +928,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
854
928
|
onJumpMemoPage: onJumpMemoPage
|
|
855
929
|
}), /*#__PURE__*/React.createElement(RemarkListModal, null), /*#__PURE__*/React.createElement(ForWardModal, {
|
|
856
930
|
flowTemplateId: flowTemplateId,
|
|
857
|
-
nodeId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
931
|
+
nodeId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no23 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no23 === void 0 ? void 0 : _currentNodeDetail$no23.id,
|
|
858
932
|
handleForWard: handleForWard
|
|
859
933
|
}), /*#__PURE__*/React.createElement(StopModal, {
|
|
860
934
|
handleStop: handleStop
|
|
@@ -86,10 +86,16 @@ function CustomizeWorkOrderCard(props) {
|
|
|
86
86
|
// 工单状态
|
|
87
87
|
'FLOW_MARK_SELECT',
|
|
88
88
|
//工单标记
|
|
89
|
+
'FLOW_TAG',
|
|
90
|
+
//工单标签
|
|
89
91
|
'HANDLER_INPUT',
|
|
90
92
|
// 处理人
|
|
91
93
|
'OPERATOR_INPUT',
|
|
92
94
|
// 提交人
|
|
95
|
+
'PREV_SUBMITTER_INPUT',
|
|
96
|
+
// 上一步提交人
|
|
97
|
+
'FLOW_CREATOR_INPUT',
|
|
98
|
+
// 流程创建人
|
|
93
99
|
'CREATED_DATETIME',
|
|
94
100
|
// 创建时间
|
|
95
101
|
'SHOP_INPUT',
|
|
@@ -21,7 +21,7 @@ import { get, every, maxBy } from 'lodash';
|
|
|
21
21
|
import V from 'voca';
|
|
22
22
|
import { orderDetail, jstOrderDetail, bsOrderDetail, wlnOrderDetail } from "../../model/servers/api";
|
|
23
23
|
import moment from 'moment';
|
|
24
|
-
import { AddressData, ExpressData, orderBackFormValues, bsOrderBackFormValues, wlnOrderBackFormValues, findLabelBySelectValue, request, isNull, bsOrderTransform, wlnOrderTransform } from '@kmkf-fe-packages/kmkf-utils';
|
|
24
|
+
import { AddressData, ExpressData, orderBackFormValues, bsOrderBackFormValues, wlnOrderBackFormValues, findLabelBySelectValue, request, isNull, bsOrderTransform, wlnOrderTransform, unTransField } from '@kmkf-fe-packages/kmkf-utils';
|
|
25
25
|
import { cloneDeep, isEqual, set } from 'lodash';
|
|
26
26
|
import { PlatForm } from "../../model/flowTemplateDetail/types";
|
|
27
27
|
import cache from "../cache";
|
|
@@ -295,7 +295,7 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
|
|
|
295
295
|
} else if (item.workOrderComponentType === 'RADIO') {
|
|
296
296
|
var _item$componentConfig4;
|
|
297
297
|
var _value = nowData[item.uniqueKey]; // { value: '', other: '' }
|
|
298
|
-
console.debug('value',
|
|
298
|
+
// console.debug('value', value);
|
|
299
299
|
contentVoList.push({
|
|
300
300
|
content: (_value === null || _value === void 0 ? void 0 : _value.value) || '',
|
|
301
301
|
name: item.name,
|
|
@@ -386,34 +386,34 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
|
|
|
386
386
|
});
|
|
387
387
|
} else if (item.workOrderComponentType === 'ITEM_SELECT_THIRD') {
|
|
388
388
|
var itemSelectThirdList = get(nowData, "".concat(item.uniqueKey), []);
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
itemSelectThirdList.forEach(
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
});
|
|
389
|
+
// const itemIds: string[] = [],
|
|
390
|
+
// supplierNames: string[] = [],
|
|
391
|
+
// numIids: string[] = [];
|
|
392
|
+
// itemSelectThirdList.forEach((item: any) => {
|
|
393
|
+
// item.itemId && itemIds.push(item.itemId);
|
|
394
|
+
// item.supplierName && supplierNames.push(item.supplierName);
|
|
395
|
+
// item.numIid && numIids.push(item.numIid);
|
|
396
|
+
// });
|
|
397
397
|
contentVoList.push({
|
|
398
398
|
uniqueKey: "".concat(item.uniqueKey, "_itemList"),
|
|
399
399
|
content: itemSelectThirdList,
|
|
400
400
|
name: item.name
|
|
401
401
|
});
|
|
402
|
-
contentVoList.push({
|
|
403
|
-
|
|
404
|
-
|
|
405
|
-
|
|
406
|
-
});
|
|
407
|
-
contentVoList.push({
|
|
408
|
-
|
|
409
|
-
|
|
410
|
-
|
|
411
|
-
});
|
|
412
|
-
contentVoList.push({
|
|
413
|
-
|
|
414
|
-
|
|
415
|
-
|
|
416
|
-
});
|
|
402
|
+
// contentVoList.push({
|
|
403
|
+
// uniqueKey: `${item.uniqueKey}_itemId`,
|
|
404
|
+
// content: itemIds.join(),
|
|
405
|
+
// name: item.name,
|
|
406
|
+
// });
|
|
407
|
+
// contentVoList.push({
|
|
408
|
+
// uniqueKey: `${item.uniqueKey}_supplierName`,
|
|
409
|
+
// content: supplierNames.join(),
|
|
410
|
+
// name: item.name,
|
|
411
|
+
// });
|
|
412
|
+
// contentVoList.push({
|
|
413
|
+
// uniqueKey: `${item.uniqueKey}_numIid`,
|
|
414
|
+
// content: numIids.join(),
|
|
415
|
+
// name: item.name,
|
|
416
|
+
// });
|
|
417
417
|
} else if (item.workOrderComponentType === 'ENTERPRISE_PAYMENT') {
|
|
418
418
|
var _suffix = ['enterprisePaymentRefundFee', 'enterprisePaymentTid', 'enterprisePaymentBuyerNick', 'enterprisePaymentBuyerOpenUid', 'enterprisePaymentAlipayNick', 'enterprisePaymentAlipayNo', 'enterprisePaymentStatus'];
|
|
419
419
|
_suffix.map(function (s) {
|
|
@@ -431,26 +431,26 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
|
|
|
431
431
|
content: get(nowData, "".concat(item.uniqueKey), []),
|
|
432
432
|
name: item.name
|
|
433
433
|
});
|
|
434
|
-
contentVoList.push({
|
|
435
|
-
|
|
436
|
-
|
|
437
|
-
|
|
438
|
-
|
|
439
|
-
|
|
440
|
-
});
|
|
434
|
+
// contentVoList.push({
|
|
435
|
+
// uniqueKey: `${item.uniqueKey}_aloneItemId`,
|
|
436
|
+
// content: get(nowData, `${item.uniqueKey}`, [])
|
|
437
|
+
// .map((item: any) => item.numIid)
|
|
438
|
+
// .join(),
|
|
439
|
+
// name: item.name,
|
|
440
|
+
// });
|
|
441
441
|
} else if (item.workOrderComponentType === 'ITEM_ENCODE') {
|
|
442
442
|
contentVoList.push({
|
|
443
443
|
uniqueKey: "".concat(item.uniqueKey, "_itemList"),
|
|
444
444
|
content: get(nowData, "".concat(item.uniqueKey), []),
|
|
445
445
|
name: item.name
|
|
446
446
|
});
|
|
447
|
-
contentVoList.push({
|
|
448
|
-
|
|
449
|
-
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
});
|
|
447
|
+
// contentVoList.push({
|
|
448
|
+
// uniqueKey: `${item.uniqueKey}_aloneItemEncode`,
|
|
449
|
+
// content: get(nowData, `${item.uniqueKey}`, [])
|
|
450
|
+
// .map((item: any) => item.outerId)
|
|
451
|
+
// .join(),
|
|
452
|
+
// name: item.name,
|
|
453
|
+
// });
|
|
454
454
|
} else if (item.workOrderComponentType === 'JST_LOGISTICS') {
|
|
455
455
|
var logisticsList = get(nowData, "".concat(item.uniqueKey), []);
|
|
456
456
|
var logisticsCompany = logisticsList.map(function (item) {
|
|
@@ -722,7 +722,7 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
|
|
|
722
722
|
});
|
|
723
723
|
contentVoList.push({
|
|
724
724
|
uniqueKey: "".concat(item.uniqueKey, "_shopCode"),
|
|
725
|
-
content: bsGoods === null || bsGoods === void 0 ? void 0 : bsGoods.shopCode,
|
|
725
|
+
content: (bsGoods === null || bsGoods === void 0 ? void 0 : bsGoods.shopCode) || '',
|
|
726
726
|
name: item.name
|
|
727
727
|
});
|
|
728
728
|
} else if (item.workOrderComponentType === 'BS_EXCHANGE_GOODS') {
|
|
@@ -740,7 +740,7 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
|
|
|
740
740
|
});
|
|
741
741
|
contentVoList.push({
|
|
742
742
|
uniqueKey: "".concat(item.uniqueKey, "_shopCode"),
|
|
743
|
-
content: bsExchange === null || bsExchange === void 0 ? void 0 : bsExchange.shopCode,
|
|
743
|
+
content: (bsExchange === null || bsExchange === void 0 ? void 0 : bsExchange.shopCode) || '',
|
|
744
744
|
name: item.name
|
|
745
745
|
});
|
|
746
746
|
if (['2', '4'].includes(bsExchange === null || bsExchange === void 0 ? void 0 : (_bsExchange$bsExchang = bsExchange.bsExchangeType) === null || _bsExchange$bsExchang === void 0 ? void 0 : _bsExchange$bsExchang[0])) {
|
|
@@ -789,7 +789,7 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
|
|
|
789
789
|
});
|
|
790
790
|
contentVoList.push({
|
|
791
791
|
uniqueKey: "".concat(item.uniqueKey, "_shopCode"),
|
|
792
|
-
content: bsReissue === null || bsReissue === void 0 ? void 0 : bsReissue.shopCode,
|
|
792
|
+
content: (bsReissue === null || bsReissue === void 0 ? void 0 : bsReissue.shopCode) || '',
|
|
793
793
|
name: item.name
|
|
794
794
|
});
|
|
795
795
|
} else if (item.workOrderComponentType === 'BS_RETURN_GOODS') {
|
|
@@ -806,7 +806,7 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
|
|
|
806
806
|
});
|
|
807
807
|
contentVoList.push({
|
|
808
808
|
uniqueKey: "".concat(item.uniqueKey, "_shopCode"),
|
|
809
|
-
content: bsReturn === null || bsReturn === void 0 ? void 0 : bsReturn.shopCode,
|
|
809
|
+
content: (bsReturn === null || bsReturn === void 0 ? void 0 : bsReturn.shopCode) || '',
|
|
810
810
|
name: item.name
|
|
811
811
|
});
|
|
812
812
|
} else if (item.workOrderComponentType === 'BS_POSTING') {
|
|
@@ -848,17 +848,23 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
|
|
|
848
848
|
order: 'wlnSystemShowOrder'
|
|
849
849
|
}
|
|
850
850
|
};
|
|
851
|
+
var selectIds = get(nowData, "".concat(item.uniqueKey, ".selectIds"), '');
|
|
852
|
+
var showOrderInfo = get(nowData, "".concat(item.uniqueKey, ".showOrderInfo"), []);
|
|
851
853
|
contentVoList.push({
|
|
852
854
|
uniqueKey: "".concat(item.uniqueKey, "_").concat(systemOrderMap[item.workOrderComponentType].no),
|
|
853
855
|
content: get(nowData, "".concat(item.uniqueKey, ".orderNo"), ''),
|
|
854
856
|
name: item.name
|
|
855
857
|
}, {
|
|
856
858
|
uniqueKey: "".concat(item.uniqueKey, "_").concat(systemOrderMap[item.workOrderComponentType].ids),
|
|
857
|
-
content:
|
|
859
|
+
content: selectIds,
|
|
858
860
|
name: item.name
|
|
859
861
|
}, {
|
|
860
862
|
uniqueKey: "".concat(item.uniqueKey, "_").concat(systemOrderMap[item.workOrderComponentType].order),
|
|
861
|
-
content:
|
|
863
|
+
content: showOrderInfo.map(function (item) {
|
|
864
|
+
return _objectSpread(_objectSpread({}, item), {}, {
|
|
865
|
+
select: (selectIds || []).includes(item.billNo)
|
|
866
|
+
});
|
|
867
|
+
}),
|
|
862
868
|
name: item.name
|
|
863
869
|
});
|
|
864
870
|
} else if (item.workOrderComponentType === 'BUYER_MESSAGE_NOTICE') {
|
|
@@ -910,36 +916,6 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
|
|
|
910
916
|
}),
|
|
911
917
|
name: item.name
|
|
912
918
|
});
|
|
913
|
-
} else if (item.workOrderComponentType === 'WLN_LOGISTICS') {
|
|
914
|
-
var wlnLogisticsList = get(nowData, "".concat(item.uniqueKey), []);
|
|
915
|
-
var wlnLogisticsCompany = wlnLogisticsList.map(function (item) {
|
|
916
|
-
return item.logisticsCompany;
|
|
917
|
-
});
|
|
918
|
-
var _hasTrans3 = wlnLogisticsCompany.some(function (t) {
|
|
919
|
-
return t && !ExpressData.getInstance().getExpressNameByCode(t, false);
|
|
920
|
-
});
|
|
921
|
-
if (_hasTrans3) {
|
|
922
|
-
needTransForm = true;
|
|
923
|
-
}
|
|
924
|
-
contentVoList.push({
|
|
925
|
-
uniqueKey: "".concat(item.uniqueKey, "_wlnLogisticsList"),
|
|
926
|
-
content: wlnLogisticsList,
|
|
927
|
-
name: item.name
|
|
928
|
-
});
|
|
929
|
-
contentVoList.push({
|
|
930
|
-
uniqueKey: "".concat(item.uniqueKey, "_wlnLogisticsCompany"),
|
|
931
|
-
content: wlnLogisticsList.map(function (item) {
|
|
932
|
-
return item.logisticsCompany + '';
|
|
933
|
-
}),
|
|
934
|
-
name: item.name
|
|
935
|
-
});
|
|
936
|
-
contentVoList.push({
|
|
937
|
-
uniqueKey: "".concat(item.uniqueKey, "_wlnLogisticsCode"),
|
|
938
|
-
content: wlnLogisticsList.map(function (item) {
|
|
939
|
-
return item.logisticsCode + '';
|
|
940
|
-
}),
|
|
941
|
-
name: item.name
|
|
942
|
-
});
|
|
943
919
|
} else if (item.workOrderComponentType === 'WLN_GOODS') {
|
|
944
920
|
var wlnGoods = get(nowData, "".concat(item.uniqueKey), {});
|
|
945
921
|
contentVoList.push({
|
|
@@ -949,7 +925,7 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
|
|
|
949
925
|
});
|
|
950
926
|
contentVoList.push({
|
|
951
927
|
uniqueKey: "".concat(item.uniqueKey, "_shopCode"),
|
|
952
|
-
content: wlnGoods === null || wlnGoods === void 0 ? void 0 : wlnGoods.shopCode,
|
|
928
|
+
content: (wlnGoods === null || wlnGoods === void 0 ? void 0 : wlnGoods.shopCode) || '',
|
|
953
929
|
name: item.name
|
|
954
930
|
});
|
|
955
931
|
} else {
|
|
@@ -2136,4 +2112,19 @@ export var getMappingConfigByTemplateDetail = function getMappingConfigByTemplat
|
|
|
2136
2112
|
readonlyComponents: readonlyComponents,
|
|
2137
2113
|
hideComponents: hideComponents
|
|
2138
2114
|
};
|
|
2115
|
+
};
|
|
2116
|
+
//转换表单信息基本数据
|
|
2117
|
+
export var transformWorkOrderDetail = function transformWorkOrderDetail(detail) {
|
|
2118
|
+
return Object.keys(detail).reduce(function (prv, key) {
|
|
2119
|
+
if (unTransField(key)) {
|
|
2120
|
+
try {
|
|
2121
|
+
prv[key] = JSON.parse(detail[key]);
|
|
2122
|
+
} catch (e) {
|
|
2123
|
+
prv[key] = detail[key];
|
|
2124
|
+
}
|
|
2125
|
+
} else {
|
|
2126
|
+
prv[key] = detail[key];
|
|
2127
|
+
}
|
|
2128
|
+
return prv;
|
|
2129
|
+
}, {});
|
|
2139
2130
|
};
|
|
@@ -78,3 +78,5 @@ export declare const batchQueryNodeDetail: (data: any) => Promise<serverProps<Ar
|
|
|
78
78
|
nodeId: string;
|
|
79
79
|
workOrderTemplateInfo: FlowTemplateNodeDetailT;
|
|
80
80
|
}>>>;
|
|
81
|
+
export declare const reminder: (data: any) => Promise<serverProps<any>>;
|
|
82
|
+
export declare const cancelReminder: (data: any) => Promise<serverProps<any>>;
|
|
@@ -147,4 +147,21 @@ export var batchQueryNodeDetail = function batchQueryNodeDetail(data) {
|
|
|
147
147
|
method: 'post',
|
|
148
148
|
data: data
|
|
149
149
|
});
|
|
150
|
+
};
|
|
151
|
+
|
|
152
|
+
// 催单
|
|
153
|
+
export var reminder = function reminder(data) {
|
|
154
|
+
return request({
|
|
155
|
+
url: '/qy/flow/operate/reminder',
|
|
156
|
+
method: 'post',
|
|
157
|
+
data: data
|
|
158
|
+
});
|
|
159
|
+
};
|
|
160
|
+
//取消催单
|
|
161
|
+
export var cancelReminder = function cancelReminder(data) {
|
|
162
|
+
return request({
|
|
163
|
+
url: '/qy/flow/operate/cancelReminder',
|
|
164
|
+
method: 'post',
|
|
165
|
+
data: data
|
|
166
|
+
});
|
|
150
167
|
};
|
|
@@ -152,12 +152,12 @@ export var fetchAllFlowOperateRecord = function fetchAllFlowOperateRecord(params
|
|
|
152
152
|
res = _context2.sent;
|
|
153
153
|
if (res.success) {
|
|
154
154
|
list = res === null || res === void 0 ? void 0 : (_res$data16 = res.data) === null || _res$data16 === void 0 ? void 0 : _res$data16.map(function (item) {
|
|
155
|
-
return {
|
|
155
|
+
return _objectSpread(_objectSpread({}, item), {}, {
|
|
156
156
|
time: (item === null || item === void 0 ? void 0 : item.created) || '',
|
|
157
157
|
operator: (item === null || item === void 0 ? void 0 : item.operator) || '',
|
|
158
158
|
context: (item === null || item === void 0 ? void 0 : item.remark) || '',
|
|
159
159
|
operatorType: (item === null || item === void 0 ? void 0 : item.flowOperateType) || ''
|
|
160
|
-
};
|
|
160
|
+
});
|
|
161
161
|
});
|
|
162
162
|
dispatch(setRemarkList(list || []));
|
|
163
163
|
}
|
|
@@ -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
|
}> & {
|
|
@@ -11,6 +11,9 @@ export declare const queryWorkOrder: (data: QueryWorkOrderParams) => Promise<any
|
|
|
11
11
|
export declare const queryTemplateDetail: (data: {
|
|
12
12
|
uniqueKey: string;
|
|
13
13
|
}) => Promise<any>;
|
|
14
|
+
export declare const listTemplateDetail: (data: {
|
|
15
|
+
templateUniqueKeyList: string[];
|
|
16
|
+
}) => Promise<any>;
|
|
14
17
|
export declare const addWorkOrder: (data: any) => Promise<any>;
|
|
15
18
|
export declare const queryWorkOrderDetail: (data: any) => Promise<any>;
|
|
16
19
|
export declare const updateWorkOrder: (data: any) => Promise<any>;
|
|
@@ -72,6 +72,14 @@ export var queryTemplateDetail = function queryTemplateDetail(data) {
|
|
|
72
72
|
data: data
|
|
73
73
|
});
|
|
74
74
|
};
|
|
75
|
+
//查询模板详情列表
|
|
76
|
+
export var listTemplateDetail = function listTemplateDetail(data) {
|
|
77
|
+
return request({
|
|
78
|
+
url: '/qy/gdfw/template/listTemplateDetail',
|
|
79
|
+
method: 'post',
|
|
80
|
+
data: data
|
|
81
|
+
});
|
|
82
|
+
};
|
|
75
83
|
//添加工单
|
|
76
84
|
export var addWorkOrder = function addWorkOrder(data) {
|
|
77
85
|
return request({
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kmkf-fe-packages/kmkf-work-order-service-component",
|
|
3
|
-
"version": "0.13.
|
|
3
|
+
"version": "0.13.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.13.
|
|
36
|
-
"@kmkf-fe-packages/kmkf-utils": "^0.13.
|
|
37
|
-
"@kmkf-fe-packages/services-components": "^0.13.
|
|
35
|
+
"@kmkf-fe-packages/basic-components": "^0.13.1",
|
|
36
|
+
"@kmkf-fe-packages/kmkf-utils": "^0.13.1",
|
|
37
|
+
"@kmkf-fe-packages/services-components": "^0.13.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": "
|
|
75
|
+
"gitHead": "b15358b27bd9bba7d13b78172a55969e29a1a0e6",
|
|
76
76
|
"gitHooks": {
|
|
77
77
|
"pre-commit": "lint-staged"
|
|
78
78
|
}
|