@kmkf-fe-packages/kmkf-work-order-service-component 1.19.11 → 1.20.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/esm/FlowTemplateDetailV2/components/FormRender/index.js +1 -1
- package/dist/esm/FlowTemplateDetailV2/index.d.ts +1 -1
- package/dist/esm/FlowTemplateDetailV2/index.js +54 -10
- package/dist/esm/FlowTemplateDetailV2/index.less +4 -3
- package/dist/esm/FlowTemplateDetailV2/store/reducers.d.ts +6 -0
- package/dist/esm/FlowTemplateDetailV2/store/reducers.js +16 -15
- package/dist/esm/common/utils/tools.js +30 -3
- package/dist/esm/common/utils/transformWorkOrderData.js +23 -1
- package/dist/esm/model/flowTemplateDetail/types.d.ts +6 -0
- package/package.json +5 -5
|
@@ -695,7 +695,7 @@ var FormRender = function FormRender(props, ref) {
|
|
|
695
695
|
setShopId(val);
|
|
696
696
|
// 清空表单字段
|
|
697
697
|
var needClearFormFields = get(templateDetail, 'componentDtoList', []).reduce(function (cur, nxt) {
|
|
698
|
-
if (['ITEM_SELECT_THIRD', 'STATUS', 'ITEM_SELECT', 'ITEM_ID', 'ITEM_ENCODE', 'JST_LOGISTICS', 'JST_ITEM_SELECT_THIRD', 'JST_SUPPLY', 'JST_SEND_GOOD', 'BS_GOODS', 'BS_EXCHANGE_GOODS', 'BS_REISSUE_GOODS', 'BS_RETURN_GOODS', 'BS_LOGISTICS', 'BS_SEND_GOOD', 'BS_SYSTEM_ORDER', 'WLN_SYSTEM_ORDER', 'WLN_GOODS', 'WLN_LOGISTICS', 'WLN_SEND_GOOD', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WDT_SYSTEM_ORDER', 'WDT_REISSUE_GOODS', 'WDT_RETURN_GOODS', 'WDT_EXCHANGE_GOODS', 'KM_SEND_GOOD', 'BS_E3_SYSTEM_ORDER'].includes(nxt === null || nxt === void 0 ? void 0 : nxt.workOrderComponentType)) {
|
|
698
|
+
if (['ITEM_SELECT_THIRD', 'STATUS', 'ITEM_SELECT', 'ITEM_ID', 'ITEM_ENCODE', 'JST_LOGISTICS', 'JST_ITEM_SELECT_THIRD', 'JST_SUPPLY', 'JST_SEND_GOOD', 'BS_GOODS', 'BS_EXCHANGE_GOODS', 'BS_REISSUE_GOODS', 'BS_RETURN_GOODS', 'BS_LOGISTICS', 'BS_SEND_GOOD', 'BS_SYSTEM_ORDER', 'WLN_SYSTEM_ORDER', 'WLN_GOODS', 'WLN_LOGISTICS', 'WLN_SEND_GOOD', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WDT_SYSTEM_ORDER', 'WDT_REISSUE_GOODS', 'WDT_RETURN_GOODS', 'WDT_EXCHANGE_GOODS', 'KM_SEND_GOOD', 'BS_E3_SYSTEM_ORDER', 'BS_E3_REISSUE_GOODS'].includes(nxt === null || nxt === void 0 ? void 0 : nxt.workOrderComponentType)) {
|
|
699
699
|
cur.push(nxt === null || nxt === void 0 ? void 0 : nxt.uniqueKey);
|
|
700
700
|
}
|
|
701
701
|
return cur;
|
|
@@ -10,7 +10,7 @@ declare type FlowTemplateDetailProps = {
|
|
|
10
10
|
privilege?: boolean;
|
|
11
11
|
onOpenWangWang?: (nick: string, id: string) => void;
|
|
12
12
|
callbackDealWorkOrderSuccess?: (type: string, workOrderId?: string) => void;
|
|
13
|
-
|
|
13
|
+
onJumpPage?: (val: any) => void;
|
|
14
14
|
onTalkChange?: (data: {
|
|
15
15
|
tid: string;
|
|
16
16
|
shopId: string;
|
|
@@ -18,7 +18,8 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
|
|
|
18
18
|
function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
|
|
19
19
|
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
20
20
|
import React, { useEffect, useState, useRef, useMemo, useContext } from 'react';
|
|
21
|
-
import { Timeline, ConfigProvider, Form, message, Alert, Button, Spin, Row, Col, Popover } from 'antd';
|
|
21
|
+
import { Timeline, ConfigProvider, Form, message, Alert, Button, Spin, Row, Col, Popover, Typography } from 'antd';
|
|
22
|
+
import { InfoCircleOutlined } from '@ant-design/icons';
|
|
22
23
|
import { get, find, isEmpty } from 'lodash';
|
|
23
24
|
import { batch } from 'react-redux';
|
|
24
25
|
import zhCN from 'antd/es/locale/zh_CN';
|
|
@@ -50,8 +51,11 @@ import { orderDetail } from "../model/servers/api";
|
|
|
50
51
|
import cache from "../common/cache";
|
|
51
52
|
import "./index.less";
|
|
52
53
|
import { isNull } from '@kmkf-fe-packages/kmkf-utils';
|
|
54
|
+
import { PlatformAvatar } from '@kmkf-fe-packages/services-components';
|
|
53
55
|
import { Provide, Context } from "./context";
|
|
54
56
|
import { useSelector } from "./context/useSelector";
|
|
57
|
+
var Text = Typography.Text,
|
|
58
|
+
Link = Typography.Link;
|
|
55
59
|
var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
56
60
|
var _currentNodeDetail$wo, _currentNodeDetail$no, _currentNodeDetail$wo2, _shopList$find, _currentNodeDetail$no21, _currentNodeDetail$no22, _currentNodeDetail$no23, _currentNodeDetail$no24;
|
|
57
61
|
var flowTemplateKey = props.flowTemplateKey,
|
|
@@ -64,7 +68,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
64
68
|
privilege = props.privilege,
|
|
65
69
|
onOpenWangWang = props.onOpenWangWang,
|
|
66
70
|
callbackDealWorkOrderSuccess = props.callbackDealWorkOrderSuccess,
|
|
67
|
-
|
|
71
|
+
onJumpPage = props.onJumpPage,
|
|
68
72
|
onTalkChange = props.onTalkChange,
|
|
69
73
|
_props$autoSubmit = props.autoSubmit,
|
|
70
74
|
autoSubmit = _props$autoSubmit === void 0 ? false : _props$autoSubmit,
|
|
@@ -149,7 +153,11 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
149
153
|
isShowRemark = !shop.notJoin && !!shop.shopSourceStr && !readonly && ['TAOBAO', 'JD', 'PDD', 'KS', 'FXG'].includes(shop.shopSourceStr);
|
|
150
154
|
shopSourceStr = shop.shopSourceStr;
|
|
151
155
|
}
|
|
152
|
-
|
|
156
|
+
var shopItem = useMemo(function () {
|
|
157
|
+
return shopList.find(function (t) {
|
|
158
|
+
return t.shopId === (plat === null || plat === void 0 ? void 0 : plat.shopId);
|
|
159
|
+
});
|
|
160
|
+
}, [shopId]);
|
|
153
161
|
// 提交请求锁
|
|
154
162
|
var submitRequestLock = useRef(false);
|
|
155
163
|
// 保存请求锁
|
|
@@ -563,7 +571,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
563
571
|
return (_t$componentConfig = t.componentConfig) === null || _t$componentConfig === void 0 ? void 0 : _t$componentConfig.repeatCheck;
|
|
564
572
|
});
|
|
565
573
|
if (replaceValue && componentList.length) {
|
|
566
|
-
var
|
|
574
|
+
var _val = Object.keys(COMPONENT_MAP).reduce(function (prv, key) {
|
|
567
575
|
if (replaceValue[key]) {
|
|
568
576
|
prv[COMPONENT_MAP[key]] = replaceValue[key];
|
|
569
577
|
}
|
|
@@ -571,7 +579,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
571
579
|
}, {});
|
|
572
580
|
return componentList.some(function (item) {
|
|
573
581
|
var _item$workOrderCompon;
|
|
574
|
-
return
|
|
582
|
+
return _val[(_item$workOrderCompon = item === null || item === void 0 ? void 0 : item.workOrderComponentType) !== null && _item$workOrderCompon !== void 0 ? _item$workOrderCompon : ''];
|
|
575
583
|
});
|
|
576
584
|
} else {
|
|
577
585
|
return false;
|
|
@@ -1127,18 +1135,50 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
1127
1135
|
onOpenWangWang: onOpenWangWang
|
|
1128
1136
|
}));
|
|
1129
1137
|
};
|
|
1138
|
+
var VersionText = function VersionText() {
|
|
1139
|
+
var _operateParams$maxPub2, _operateParams$maxPub3;
|
|
1140
|
+
return /*#__PURE__*/React.createElement(Text, {
|
|
1141
|
+
type: "secondary"
|
|
1142
|
+
}, /*#__PURE__*/React.createElement(InfoCircleOutlined, null), "\u5F53\u524D\u5DE5\u5355\u6240\u5C5E\u6D41\u7A0B", plat.platform === 'pc' ? /*#__PURE__*/React.createElement(Link, {
|
|
1143
|
+
style: {
|
|
1144
|
+
cursor: 'pointer'
|
|
1145
|
+
},
|
|
1146
|
+
onClick: function onClick() {
|
|
1147
|
+
return onJumpPage === null || onJumpPage === void 0 ? void 0 : onJumpPage({
|
|
1148
|
+
type: 'version',
|
|
1149
|
+
flowTemplateId: flowTemplateId
|
|
1150
|
+
});
|
|
1151
|
+
}
|
|
1152
|
+
}, "v", operateParams === null || operateParams === void 0 ? void 0 : operateParams.flowVersion, "\u7248") : "v".concat(operateParams === null || operateParams === void 0 ? void 0 : operateParams.flowVersion, "\u7248"), "\uFF0C\u76EE\u524D\u6700\u65B0\u6D41\u7A0B", plat.platform === 'pc' ? /*#__PURE__*/React.createElement(Link, {
|
|
1153
|
+
style: {
|
|
1154
|
+
cursor: 'pointer'
|
|
1155
|
+
},
|
|
1156
|
+
onClick: function onClick() {
|
|
1157
|
+
var _operateParams$maxPub;
|
|
1158
|
+
return onJumpPage === null || onJumpPage === void 0 ? void 0 : onJumpPage({
|
|
1159
|
+
type: 'version',
|
|
1160
|
+
flowTemplateId: operateParams === null || operateParams === void 0 ? void 0 : (_operateParams$maxPub = operateParams.maxPublishVersionTemplate) === null || _operateParams$maxPub === void 0 ? void 0 : _operateParams$maxPub.id
|
|
1161
|
+
});
|
|
1162
|
+
}
|
|
1163
|
+
}, "v", operateParams === null || operateParams === void 0 ? void 0 : (_operateParams$maxPub2 = operateParams.maxPublishVersionTemplate) === null || _operateParams$maxPub2 === void 0 ? void 0 : _operateParams$maxPub2.version, "\u7248") : "v".concat(operateParams === null || operateParams === void 0 ? void 0 : (_operateParams$maxPub3 = operateParams.maxPublishVersionTemplate) === null || _operateParams$maxPub3 === void 0 ? void 0 : _operateParams$maxPub3.version, "\u7248"));
|
|
1164
|
+
};
|
|
1130
1165
|
return /*#__PURE__*/React.createElement(Spin, {
|
|
1131
1166
|
spinning: loading
|
|
1132
1167
|
}, /*#__PURE__*/React.createElement("div", {
|
|
1133
1168
|
className: "flowWorkOrderDetail"
|
|
1134
|
-
},
|
|
1169
|
+
}, flowWorkOrderId && /*#__PURE__*/React.createElement("div", null, plat.platform === 'pc' && /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement(PlatformAvatar, {
|
|
1170
|
+
type: shopItem === null || shopItem === void 0 ? void 0 : shopItem.shopSource,
|
|
1171
|
+
styles: {
|
|
1172
|
+
marginRight: 5
|
|
1173
|
+
}
|
|
1174
|
+
}), shopItem === null || shopItem === void 0 ? void 0 : shopItem.shopName, "-"), /*#__PURE__*/React.createElement("span", null, flowWorkOrderId)), flowStatus && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Row, {
|
|
1135
1175
|
justify: 'space-between',
|
|
1136
1176
|
className: "header"
|
|
1137
1177
|
}, /*#__PURE__*/React.createElement(Col, null, /*#__PURE__*/React.createElement("div", {
|
|
1138
1178
|
className: "statusWrap"
|
|
1139
1179
|
}, "\u6D41\u7A0B\u72B6\u6001\uFF1A", /*#__PURE__*/React.createElement("div", {
|
|
1140
1180
|
className: "status ".concat(flowStatus)
|
|
1141
|
-
}), /*#__PURE__*/React.createElement("span", null, FLOW_STATUS_V2[flowStatus]))), flowTemplateType !== 'SINGLE_PAGE' && /*#__PURE__*/React.createElement(Col, {
|
|
1181
|
+
}), /*#__PURE__*/React.createElement("span", null, FLOW_STATUS_V2[flowStatus]), plat.platform === 'pc' ? VersionText() : '')), flowTemplateType !== 'SINGLE_PAGE' && /*#__PURE__*/React.createElement(Col, {
|
|
1142
1182
|
style: {
|
|
1143
1183
|
position: 'relative',
|
|
1144
1184
|
zIndex: 1,
|
|
@@ -1154,8 +1194,8 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
1154
1194
|
onClick: function onClick() {
|
|
1155
1195
|
return setOpenCloseVisible('close');
|
|
1156
1196
|
}
|
|
1157
|
-
}, "\u6536\u8D77\u5168\u90E8"))), /*#__PURE__*/React.createElement("div", {
|
|
1158
|
-
className: "center ".concat(
|
|
1197
|
+
}, "\u6536\u8D77\u5168\u90E8"))), plat.platform !== 'pc' ? VersionText() : ''), /*#__PURE__*/React.createElement("div", {
|
|
1198
|
+
className: "center ".concat(readonly ? 'readonly' : '')
|
|
1159
1199
|
}, currentTradeIdLinkWorkOrderId.total > 0 && /*#__PURE__*/React.createElement("div", {
|
|
1160
1200
|
className: "alertRepeatTradeId"
|
|
1161
1201
|
}, /*#__PURE__*/React.createElement(Alert, {
|
|
@@ -1226,7 +1266,11 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
1226
1266
|
form: form,
|
|
1227
1267
|
orderRemarkObj: orderRemarkObj,
|
|
1228
1268
|
plat: plat,
|
|
1229
|
-
onJumpMemoPage: onJumpMemoPage
|
|
1269
|
+
onJumpMemoPage: function onJumpMemoPage() {
|
|
1270
|
+
return onJumpPage === null || onJumpPage === void 0 ? void 0 : onJumpPage({
|
|
1271
|
+
type: 'memo'
|
|
1272
|
+
});
|
|
1273
|
+
}
|
|
1230
1274
|
}), /*#__PURE__*/React.createElement(RemarkListModal, null), /*#__PURE__*/React.createElement(ForWardModal, {
|
|
1231
1275
|
flowTemplateId: flowTemplateId,
|
|
1232
1276
|
nodeId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no23 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no23 === void 0 ? void 0 : _currentNodeDetail$no23.id,
|
|
@@ -7,15 +7,16 @@
|
|
|
7
7
|
}
|
|
8
8
|
.header {
|
|
9
9
|
background: #FFF;
|
|
10
|
-
height: 24px;
|
|
10
|
+
min-height: 24px;
|
|
11
11
|
width: 100%;
|
|
12
|
-
margin-bottom: 8px;
|
|
12
|
+
// margin-bottom: 8px;
|
|
13
13
|
box-sizing: content-box;
|
|
14
14
|
z-index: 99;
|
|
15
|
-
padding: 8px;
|
|
15
|
+
// padding: 8px;
|
|
16
16
|
.statusWrap {
|
|
17
17
|
display: flex;
|
|
18
18
|
align-items: center;
|
|
19
|
+
flex-wrap: wrap;
|
|
19
20
|
> span {
|
|
20
21
|
margin-left: 8px;
|
|
21
22
|
}
|
|
@@ -53,6 +53,12 @@ declare const reducers: (state: FlowTemplateDetailState | undefined, action: {
|
|
|
53
53
|
flowVersion: number;
|
|
54
54
|
flowWorkOrderUpdateTime: string;
|
|
55
55
|
workOrderUpdateTime: number;
|
|
56
|
+
maxPublishVersionTemplate: {
|
|
57
|
+
id: string;
|
|
58
|
+
name: string;
|
|
59
|
+
publishTime: number;
|
|
60
|
+
version: number;
|
|
61
|
+
};
|
|
56
62
|
} | undefined;
|
|
57
63
|
addRemarkVisible: boolean;
|
|
58
64
|
flowStatus: FlowStatus | undefined;
|
|
@@ -45,7 +45,7 @@ export var initState = {
|
|
|
45
45
|
export var fetchPanelInfo = function fetchPanelInfo(params, options) {
|
|
46
46
|
return /*#__PURE__*/function () {
|
|
47
47
|
var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(dispatch) {
|
|
48
|
-
var res, _res$data, _res$data$flowRecordL, _res$data$flowRecordL2, _res$data2, _res$data2$currentNod, _res$data2$currentNod2, _last, _res$
|
|
48
|
+
var res, _res$data, _res$data$flowRecordL, _res$data$flowRecordL2, _res$data2, _res$data2$currentNod, _res$data2$currentNod2, _last, _res$data15, _currentNodeDetail$wo, _currentNodeDetail$no, _res$data16, _currentNodeDetail$no2, recordList, _recordList, currentNodeDetail, handlerList, assistants, _res$data17, _currentNodeDetail$no3, assistantRes, _assistantRes$data;
|
|
49
49
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
50
50
|
while (1) switch (_context.prev = _context.next) {
|
|
51
51
|
case 0:
|
|
@@ -86,7 +86,7 @@ export var fetchPanelInfo = function fetchPanelInfo(params, options) {
|
|
|
86
86
|
recordList = (_recordList = recordList) === null || _recordList === void 0 ? void 0 : _recordList.slice(0, -1);
|
|
87
87
|
}
|
|
88
88
|
unstable_batchedUpdates(function () {
|
|
89
|
-
var _res$data3, _res$data4, _res$data5, _res$data6, _res$data7, _res$data8, _res$data9, _res$data10, _res$data11, _res$data12, _res$data13;
|
|
89
|
+
var _res$data3, _res$data4, _res$data5, _res$data6, _res$data7, _res$data8, _res$data9, _res$data10, _res$data11, _res$data12, _res$data13, _res$data14;
|
|
90
90
|
dispatch({
|
|
91
91
|
type: 'setFlowList',
|
|
92
92
|
payload: recordList || []
|
|
@@ -111,42 +111,43 @@ export var fetchPanelInfo = function fetchPanelInfo(params, options) {
|
|
|
111
111
|
flowTemplateKey: res === null || res === void 0 ? void 0 : (_res$data6 = res.data) === null || _res$data6 === void 0 ? void 0 : _res$data6.flowTemplateKey,
|
|
112
112
|
flowVersion: res === null || res === void 0 ? void 0 : (_res$data7 = res.data) === null || _res$data7 === void 0 ? void 0 : _res$data7.flowVersion,
|
|
113
113
|
flowWorkOrderUpdateTime: res === null || res === void 0 ? void 0 : (_res$data8 = res.data) === null || _res$data8 === void 0 ? void 0 : _res$data8.flowWorkOrderUpdateTime,
|
|
114
|
-
workOrderUpdateTime: res === null || res === void 0 ? void 0 : (_res$data9 = res.data) === null || _res$data9 === void 0 ? void 0 : _res$data9.workOrderUpdateTime
|
|
114
|
+
workOrderUpdateTime: res === null || res === void 0 ? void 0 : (_res$data9 = res.data) === null || _res$data9 === void 0 ? void 0 : _res$data9.workOrderUpdateTime,
|
|
115
|
+
maxPublishVersionTemplate: res === null || res === void 0 ? void 0 : (_res$data10 = res.data) === null || _res$data10 === void 0 ? void 0 : _res$data10.maxPublishVersionTemplate
|
|
115
116
|
}
|
|
116
117
|
});
|
|
117
118
|
dispatch({
|
|
118
119
|
type: 'setFlowTemplateType',
|
|
119
|
-
payload: res === null || res === void 0 ? void 0 : (_res$
|
|
120
|
+
payload: res === null || res === void 0 ? void 0 : (_res$data11 = res.data) === null || _res$data11 === void 0 ? void 0 : _res$data11.flowTemplateType
|
|
120
121
|
});
|
|
121
122
|
dispatch({
|
|
122
123
|
type: 'setFlowStatus',
|
|
123
|
-
payload: res === null || res === void 0 ? void 0 : (_res$
|
|
124
|
+
payload: res === null || res === void 0 ? void 0 : (_res$data12 = res.data) === null || _res$data12 === void 0 ? void 0 : _res$data12.flowStatus
|
|
124
125
|
});
|
|
125
126
|
dispatch({
|
|
126
127
|
type: 'setFlowTemplateId',
|
|
127
|
-
payload: (res === null || res === void 0 ? void 0 : (_res$
|
|
128
|
+
payload: (res === null || res === void 0 ? void 0 : (_res$data13 = res.data) === null || _res$data13 === void 0 ? void 0 : _res$data13.flowTemplateId) || ''
|
|
128
129
|
});
|
|
129
130
|
dispatch({
|
|
130
131
|
type: 'setCurrentFlowAllShowHideRules',
|
|
131
132
|
payload: {
|
|
132
|
-
allShowHideRules: res === null || res === void 0 ? void 0 : (_res$
|
|
133
|
+
allShowHideRules: res === null || res === void 0 ? void 0 : (_res$data14 = res.data) === null || _res$data14 === void 0 ? void 0 : _res$data14.allShowHideRules
|
|
133
134
|
}
|
|
134
135
|
});
|
|
135
136
|
});
|
|
136
137
|
// 如果
|
|
137
|
-
currentNodeDetail = res === null || res === void 0 ? void 0 : (_res$
|
|
138
|
+
currentNodeDetail = res === null || res === void 0 ? void 0 : (_res$data15 = res.data) === null || _res$data15 === void 0 ? void 0 : _res$data15.currentNodeDetail;
|
|
138
139
|
handlerList = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo === void 0 ? void 0 : _currentNodeDetail$wo.handlerList;
|
|
139
140
|
assistants = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no === void 0 ? void 0 : _currentNodeDetail$no.assistants;
|
|
140
141
|
if (!(Array.isArray(handlerList) && handlerList.length &&
|
|
141
142
|
// 有处理人
|
|
142
143
|
!(assistants !== null && assistants !== void 0 && assistants.isAllStaff) && // 不是所有人都能处理,查询能够处理的人
|
|
143
|
-
res !== null && res !== void 0 && (_res$
|
|
144
|
+
res !== null && res !== void 0 && (_res$data16 = res.data) !== null && _res$data16 !== void 0 && _res$data16.flowTemplateId && currentNodeDetail !== null && currentNodeDetail !== void 0 && (_currentNodeDetail$no2 = currentNodeDetail.nodeInfo) !== null && _currentNodeDetail$no2 !== void 0 && _currentNodeDetail$no2.id)) {
|
|
144
145
|
_context.next = 17;
|
|
145
146
|
break;
|
|
146
147
|
}
|
|
147
148
|
_context.next = 15;
|
|
148
149
|
return queryMultiNodeAssistantInfo([{
|
|
149
|
-
flowTemplateId: res === null || res === void 0 ? void 0 : (_res$
|
|
150
|
+
flowTemplateId: res === null || res === void 0 ? void 0 : (_res$data17 = res.data) === null || _res$data17 === void 0 ? void 0 : _res$data17.flowTemplateId,
|
|
150
151
|
currentNodeId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no3 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no3 === void 0 ? void 0 : _currentNodeDetail$no3.id
|
|
151
152
|
}]);
|
|
152
153
|
case 15:
|
|
@@ -185,7 +186,7 @@ export var fetchPanelInfo = function fetchPanelInfo(params, options) {
|
|
|
185
186
|
export var fetchAllFlowOperateRecord = function fetchAllFlowOperateRecord(params) {
|
|
186
187
|
return /*#__PURE__*/function () {
|
|
187
188
|
var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(dispatch) {
|
|
188
|
-
var res, _res$
|
|
189
|
+
var res, _res$data18, list;
|
|
189
190
|
return _regeneratorRuntime().wrap(function _callee2$(_context2) {
|
|
190
191
|
while (1) switch (_context2.prev = _context2.next) {
|
|
191
192
|
case 0:
|
|
@@ -199,7 +200,7 @@ export var fetchAllFlowOperateRecord = function fetchAllFlowOperateRecord(params
|
|
|
199
200
|
case 4:
|
|
200
201
|
res = _context2.sent;
|
|
201
202
|
if (res.success) {
|
|
202
|
-
list = res === null || res === void 0 ? void 0 : (_res$
|
|
203
|
+
list = res === null || res === void 0 ? void 0 : (_res$data18 = res.data) === null || _res$data18 === void 0 ? void 0 : _res$data18.map(function (item) {
|
|
203
204
|
return _objectSpread(_objectSpread({}, item), {}, {
|
|
204
205
|
time: (item === null || item === void 0 ? void 0 : item.created) || '',
|
|
205
206
|
operator: (item === null || item === void 0 ? void 0 : item.operator) || '',
|
|
@@ -240,7 +241,7 @@ export var fetchAllFlowOperateRecord = function fetchAllFlowOperateRecord(params
|
|
|
240
241
|
export var fetchCurrentTradeIdLinkWorkOrder = function fetchCurrentTradeIdLinkWorkOrder(params) {
|
|
241
242
|
return /*#__PURE__*/function () {
|
|
242
243
|
var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(dispatch) {
|
|
243
|
-
var res, _res$
|
|
244
|
+
var res, _res$data19, _res$data20, total, list;
|
|
244
245
|
return _regeneratorRuntime().wrap(function _callee3$(_context3) {
|
|
245
246
|
while (1) switch (_context3.prev = _context3.next) {
|
|
246
247
|
case 0:
|
|
@@ -254,8 +255,8 @@ export var fetchCurrentTradeIdLinkWorkOrder = function fetchCurrentTradeIdLinkWo
|
|
|
254
255
|
case 4:
|
|
255
256
|
res = _context3.sent;
|
|
256
257
|
if (res.success) {
|
|
257
|
-
total = (res === null || res === void 0 ? void 0 : (_res$
|
|
258
|
-
list = (res === null || res === void 0 ? void 0 : (_res$
|
|
258
|
+
total = (res === null || res === void 0 ? void 0 : (_res$data19 = res.data) === null || _res$data19 === void 0 ? void 0 : _res$data19.total) || 0;
|
|
259
|
+
list = (res === null || res === void 0 ? void 0 : (_res$data20 = res.data) === null || _res$data20 === void 0 ? void 0 : _res$data20.list) || [];
|
|
259
260
|
dispatch({
|
|
260
261
|
type: 'setCurrentTradeIdWOrkOrderNumber',
|
|
261
262
|
payload: {
|
|
@@ -1051,6 +1051,33 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
|
|
|
1051
1051
|
}),
|
|
1052
1052
|
name: item.name
|
|
1053
1053
|
});
|
|
1054
|
+
} else if (['BS_E3_REISSUE_GOODS'].includes(item.workOrderComponentType)) {
|
|
1055
|
+
contentVoList.push({
|
|
1056
|
+
uniqueKey: "".concat(item.uniqueKey, "_bsE3SystemOrderNo"),
|
|
1057
|
+
content: get(nowData, "".concat(item.uniqueKey, ".bsE3SystemOrderNo"), ''),
|
|
1058
|
+
name: item.name
|
|
1059
|
+
}, {
|
|
1060
|
+
uniqueKey: "".concat(item.uniqueKey, "_bsE3ReissueType"),
|
|
1061
|
+
content: get(nowData, "".concat(item.uniqueKey, ".bsE3ReissueType"), ''),
|
|
1062
|
+
name: item.name
|
|
1063
|
+
}, {
|
|
1064
|
+
uniqueKey: "".concat(item.uniqueKey, "_bsE3ReissueMemo"),
|
|
1065
|
+
content: get(nowData, "".concat(item.uniqueKey, ".bsE3ReissueMemo"), ''),
|
|
1066
|
+
name: item.name
|
|
1067
|
+
}, {
|
|
1068
|
+
uniqueKey: "".concat(item.uniqueKey, "_bsE3ReissueGoods"),
|
|
1069
|
+
content: get(nowData, "".concat(item.uniqueKey, ".bsE3ReissueGoods"), []),
|
|
1070
|
+
// ?.map((item: { isGift: string | undefined }) => {
|
|
1071
|
+
// if (typeof item.isGift === 'string') {
|
|
1072
|
+
// return {
|
|
1073
|
+
// ...item,
|
|
1074
|
+
// isGift: item.isGift === '是' ? 1 : 0
|
|
1075
|
+
// }
|
|
1076
|
+
// }
|
|
1077
|
+
// return item;
|
|
1078
|
+
// }),
|
|
1079
|
+
name: item.name
|
|
1080
|
+
});
|
|
1054
1081
|
} else if (item.workOrderComponentType === 'BUYER_MESSAGE_NOTICE') {
|
|
1055
1082
|
var _nowData$item$uniqueK;
|
|
1056
1083
|
contentVoList.push({
|
|
@@ -1223,7 +1250,7 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
1223
1250
|
return !item.notJoin && item.shopId == shopId;
|
|
1224
1251
|
}); //判断是否有百胜组件 有就请求bs订单接口
|
|
1225
1252
|
hasBs = HasFilterHandle(templateDetail, ['BS_SIGNING_TIME', 'BS_SEND_TIME', 'BS_TRADE_PAYMENT_TIME', 'BS_NET_RECEIPTS', 'BS_PACKAGE_WEIGHT', 'BS_GOODS', 'BS_DEPOSIT', 'BS_LOGISTICS', 'BS_SEND_GOOD', 'BS_POSTING', 'BS_SYSTEM_ORDER', 'BS_DELIVERY_NO']); //判断是否有旺店通组件 有就请求wdt订单接口
|
|
1226
|
-
hasWdt = HasFilterHandle(templateDetail, ['WDT_SYSTEM_ORDER', 'WDT_GOODS', 'WDT_LOGISTICS', 'WDT_SEND_GOOD'
|
|
1253
|
+
hasWdt = HasFilterHandle(templateDetail, ['WDT_SYSTEM_ORDER', 'WDT_GOODS', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WDT_REISSUE_GOODS'
|
|
1227
1254
|
// 'WDT_SIGNING_TIME',
|
|
1228
1255
|
// 'WDT_SEND_TIME',
|
|
1229
1256
|
// 'WDT_TRADE_PAYMENT_TIME',
|
|
@@ -1233,9 +1260,9 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
1233
1260
|
// 'WDT_POSTING',
|
|
1234
1261
|
// 'WDT_DELIVERY_NO',
|
|
1235
1262
|
]); // 判断是否有旺店通组件 有就请求bsE3订单接口
|
|
1236
|
-
hasBsE3 = HasFilterHandle(templateDetail, ['BS_E3_SYSTEM_ORDER', 'BS_E3_GOODS']); //判断是否有万里牛组件 有就请求wln订单接口
|
|
1263
|
+
hasBsE3 = HasFilterHandle(templateDetail, ['BS_E3_SYSTEM_ORDER', 'BS_E3_GOODS', 'BS_E3_REISSUE_GOODS']); //判断是否有万里牛组件 有就请求wln订单接口
|
|
1237
1264
|
hasWln = HasFilterHandle(templateDetail, ['WLN_SYSTEM_ORDER', 'WLN_GOODS', 'WLN_LOGISTICS', 'WLN_SEND_GOOD']); //如果不是对接店铺且百胜组件都没有
|
|
1238
|
-
if (!(!JOIN_SHOP && !hasBs && !hasWln && !hasWdt)) {
|
|
1265
|
+
if (!(!JOIN_SHOP && !hasBs && !hasWln && !hasWdt && !hasBsE3)) {
|
|
1239
1266
|
_context.next = 8;
|
|
1240
1267
|
break;
|
|
1241
1268
|
}
|
|
@@ -669,6 +669,27 @@ var processSingleField = function processSingleField(getValue) {
|
|
|
669
669
|
return _defineProperty({}, nex.uniqueKey, getValue("".concat(nex.uniqueKey, "_").concat(updateWorkTypeKeys[nex.workOrderComponentType])));
|
|
670
670
|
};
|
|
671
671
|
};
|
|
672
|
+
var processBsE3ReissueGoods = function processBsE3ReissueGoods(templateColumns) {
|
|
673
|
+
return function (getValue) {
|
|
674
|
+
return function (nex, config) {
|
|
675
|
+
var orderNo = '';
|
|
676
|
+
var tradeId = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
|
|
677
|
+
return col.workOrderComponentType === 'TRADE_ID_INPUT';
|
|
678
|
+
});
|
|
679
|
+
if (tradeId) {
|
|
680
|
+
orderNo = getValue("".concat(tradeId.uniqueKey, "_").concat(updateWorkTypeKeys[tradeId.workOrderComponentType]));
|
|
681
|
+
}
|
|
682
|
+
return _defineProperty({}, nex.uniqueKey, {
|
|
683
|
+
bsE3SystemOrder: {
|
|
684
|
+
orderNo: orderNo
|
|
685
|
+
},
|
|
686
|
+
bsE3SystemOrderNo: getValue("".concat(nex.uniqueKey, "_bsE3SystemOrderNo")),
|
|
687
|
+
bsE3ReissueType: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_bsE3ReissueType")), ['1']),
|
|
688
|
+
bsE3ReissueGoods: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_bsE3ReissueGoods")), [])
|
|
689
|
+
});
|
|
690
|
+
};
|
|
691
|
+
};
|
|
692
|
+
};
|
|
672
693
|
var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
|
|
673
694
|
var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'edit';
|
|
674
695
|
return function (item) {
|
|
@@ -771,7 +792,8 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
|
|
|
771
792
|
BS_DEPOSIT: processSingleField,
|
|
772
793
|
NEW_PAYMENT_STATUS: processSingleField,
|
|
773
794
|
BUSINESS_ORDER_NO: processSingleField,
|
|
774
|
-
PAYMENT_VOUCHER_CODE: processSingleField
|
|
795
|
+
PAYMENT_VOUCHER_CODE: processSingleField,
|
|
796
|
+
BS_E3_REISSUE_GOODS: processBsE3ReissueGoods(templateColumns)
|
|
775
797
|
};
|
|
776
798
|
return templateColumns.reduce(function (cur, nex) {
|
|
777
799
|
var config = type === 'init' ? nex.componentConfig : {};
|
|
@@ -47,6 +47,12 @@ export interface FlowTemplateDetailState {
|
|
|
47
47
|
flowVersion: number;
|
|
48
48
|
flowWorkOrderUpdateTime: string;
|
|
49
49
|
workOrderUpdateTime: number;
|
|
50
|
+
maxPublishVersionTemplate: {
|
|
51
|
+
id: string;
|
|
52
|
+
name: string;
|
|
53
|
+
publishTime: number;
|
|
54
|
+
version: number;
|
|
55
|
+
};
|
|
50
56
|
};
|
|
51
57
|
addRemarkVisible: boolean;
|
|
52
58
|
flowStatus: FlowStatus | undefined;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kmkf-fe-packages/kmkf-work-order-service-component",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.20.0",
|
|
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": "1.
|
|
36
|
-
"@kmkf-fe-packages/kmkf-utils": "1.
|
|
37
|
-
"@kmkf-fe-packages/services-components": "1.
|
|
35
|
+
"@kmkf-fe-packages/basic-components": "1.20.0",
|
|
36
|
+
"@kmkf-fe-packages/kmkf-utils": "1.20.0",
|
|
37
|
+
"@kmkf-fe-packages/services-components": "1.20.0",
|
|
38
38
|
"@reduxjs/toolkit": "^1.8.5",
|
|
39
39
|
"ahooks": "^3.7.4",
|
|
40
40
|
"copy-to-clipboard": "^3.3.3",
|
|
@@ -73,7 +73,7 @@
|
|
|
73
73
|
"publishConfig": {
|
|
74
74
|
"access": "public"
|
|
75
75
|
},
|
|
76
|
-
"gitHead": "
|
|
76
|
+
"gitHead": "885c4ea232f39e0dde8083ffe34a8305dc616d26",
|
|
77
77
|
"gitHooks": {
|
|
78
78
|
"pre-commit": "lint-staged"
|
|
79
79
|
}
|