@kmkf-fe-packages/kmkf-work-order-service-component 2.0.54-beta.86 → 2.0.54-beta.89
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.
|
@@ -33,7 +33,7 @@ import { currentUserHasOperatorAuth } from "../../common";
|
|
|
33
33
|
import { useSelector } from "../../context/useSelector";
|
|
34
34
|
import { Context } from "../../context";
|
|
35
35
|
var NodeItem = function NodeItem(props) {
|
|
36
|
-
var _data$
|
|
36
|
+
var _data$data17, _data$data18, _data$data18$workOrde, _data$data19, _data$data19$workOrde, _data$data20, _data$data20$nodeInfo, _data$data21, _data$data22, _data$data22$nodeInfo, _data$data23, _data$data24, _data$data25, _data$data25$workOrde, _data$data26;
|
|
37
37
|
var tag = props.tag,
|
|
38
38
|
nodeId = props.nodeId,
|
|
39
39
|
nodeName = props.nodeName,
|
|
@@ -69,6 +69,7 @@ var NodeItem = function NodeItem(props) {
|
|
|
69
69
|
setEditing = _useState4[1];
|
|
70
70
|
// 是否是人工任务
|
|
71
71
|
var isArtificialNode = tag === 'artificial';
|
|
72
|
+
var isAutoNode = tag === 'auto';
|
|
72
73
|
var flowStatus = useSelector(selectFlowStatus);
|
|
73
74
|
var allShowHideRules = useSelector(selectCurrentFlowAllShowHideRules);
|
|
74
75
|
var assistantMap = useSelector(selectNodeAssistantMap);
|
|
@@ -254,14 +255,20 @@ var NodeItem = function NodeItem(props) {
|
|
|
254
255
|
// dispatch(setLabelList(data?.map(item => item?.labelShowName) || []))
|
|
255
256
|
// }
|
|
256
257
|
// };
|
|
257
|
-
var
|
|
258
|
+
var renderAutoNodeDetail = function renderAutoNodeDetail() {
|
|
259
|
+
var _data$data10, _data$data10$flowEven, _data$data10$flowEven2, _data$data10$flowEven3, _data$data10$flowEven4, _data$data11, _data$data11$flowEven, _data$data11$flowEven2, _data$data11$flowEven3, _data$data11$flowEven4, _data$data12, _data$data12$flowEven, _data$data12$flowEven2, _data$data12$flowEven3, _data$data12$flowEven4, _data$data13, _data$data13$flowEven, _data$data13$flowEven2, _data$data13$flowEven3, _data$data14, _data$data14$flowEven, _data$data14$flowEven2, _data$data14$flowEven3, _data$data15, _data$data15$flowEven, _data$data15$flowEven2, _data$data15$flowEven3, _data$data15$flowEven4, _data$data16, _data$data16$flowEven, _data$data16$flowEven2, _data$data16$flowEven3, _data$data16$flowEven4;
|
|
260
|
+
return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("p", null, (data === null || data === void 0 ? void 0 : (_data$data10 = data.data) === null || _data$data10 === void 0 ? void 0 : (_data$data10$flowEven = _data$data10.flowEventData) === null || _data$data10$flowEven === void 0 ? void 0 : (_data$data10$flowEven2 = _data$data10$flowEven.eventData) === null || _data$data10$flowEven2 === void 0 ? void 0 : (_data$data10$flowEven3 = _data$data10$flowEven2.businessStatus) === null || _data$data10$flowEven3 === void 0 ? void 0 : (_data$data10$flowEven4 = _data$data10$flowEven3[0]) === null || _data$data10$flowEven4 === void 0 ? void 0 : _data$data10$flowEven4.businessStatusDesc) && "\u6267\u884C\u72B6\u6001: ".concat(data === null || data === void 0 ? void 0 : (_data$data11 = data.data) === null || _data$data11 === void 0 ? void 0 : (_data$data11$flowEven = _data$data11.flowEventData) === null || _data$data11$flowEven === void 0 ? void 0 : (_data$data11$flowEven2 = _data$data11$flowEven.eventData) === null || _data$data11$flowEven2 === void 0 ? void 0 : (_data$data11$flowEven3 = _data$data11$flowEven2.businessStatus) === null || _data$data11$flowEven3 === void 0 ? void 0 : (_data$data11$flowEven4 = _data$data11$flowEven3[0]) === null || _data$data11$flowEven4 === void 0 ? void 0 : _data$data11$flowEven4.businessStatusDesc)), /*#__PURE__*/React.createElement("p", null, [2, 1].includes(data === null || data === void 0 ? void 0 : (_data$data12 = data.data) === null || _data$data12 === void 0 ? void 0 : (_data$data12$flowEven = _data$data12.flowEventData) === null || _data$data12$flowEven === void 0 ? void 0 : (_data$data12$flowEven2 = _data$data12$flowEven.eventData) === null || _data$data12$flowEven2 === void 0 ? void 0 : (_data$data12$flowEven3 = _data$data12$flowEven2.businessStatus) === null || _data$data12$flowEven3 === void 0 ? void 0 : (_data$data12$flowEven4 = _data$data12$flowEven3[0]) === null || _data$data12$flowEven4 === void 0 ? void 0 : _data$data12$flowEven4.businessStatus) && (data === null || data === void 0 ? void 0 : (_data$data13 = data.data) === null || _data$data13 === void 0 ? void 0 : (_data$data13$flowEven = _data$data13.flowEventData) === null || _data$data13$flowEven === void 0 ? void 0 : (_data$data13$flowEven2 = _data$data13$flowEven.eventData) === null || _data$data13$flowEven2 === void 0 ? void 0 : (_data$data13$flowEven3 = _data$data13$flowEven2.otherBusinessData) === null || _data$data13$flowEven3 === void 0 ? void 0 : _data$data13$flowEven3.ruleName) && "\u547D\u4E2D\u89C4\u5219\u540D\u79F0: ".concat(data === null || data === void 0 ? void 0 : (_data$data14 = data.data) === null || _data$data14 === void 0 ? void 0 : (_data$data14$flowEven = _data$data14.flowEventData) === null || _data$data14$flowEven === void 0 ? void 0 : (_data$data14$flowEven2 = _data$data14$flowEven.eventData) === null || _data$data14$flowEven2 === void 0 ? void 0 : (_data$data14$flowEven3 = _data$data14$flowEven2.otherBusinessData) === null || _data$data14$flowEven3 === void 0 ? void 0 : _data$data14$flowEven3.ruleName)), /*#__PURE__*/React.createElement("p", null, (data === null || data === void 0 ? void 0 : (_data$data15 = data.data) === null || _data$data15 === void 0 ? void 0 : (_data$data15$flowEven = _data$data15.flowEventData) === null || _data$data15$flowEven === void 0 ? void 0 : (_data$data15$flowEven2 = _data$data15$flowEven.eventData) === null || _data$data15$flowEven2 === void 0 ? void 0 : (_data$data15$flowEven3 = _data$data15$flowEven2.otherBusinessData) === null || _data$data15$flowEven3 === void 0 ? void 0 : (_data$data15$flowEven4 = _data$data15$flowEven3.passConditionList) === null || _data$data15$flowEven4 === void 0 ? void 0 : _data$data15$flowEven4.length) > 0 && /*#__PURE__*/React.createElement("span", null, data === null || data === void 0 ? void 0 : (_data$data16 = data.data) === null || _data$data16 === void 0 ? void 0 : (_data$data16$flowEven = _data$data16.flowEventData) === null || _data$data16$flowEven === void 0 ? void 0 : (_data$data16$flowEven2 = _data$data16$flowEven.eventData) === null || _data$data16$flowEven2 === void 0 ? void 0 : (_data$data16$flowEven3 = _data$data16$flowEven2.otherBusinessData) === null || _data$data16$flowEven3 === void 0 ? void 0 : (_data$data16$flowEven4 = _data$data16$flowEven3.passConditionList) === null || _data$data16$flowEven4 === void 0 ? void 0 : _data$data16$flowEven4.map(function (item) {
|
|
261
|
+
return /*#__PURE__*/React.createElement("p", null, item);
|
|
262
|
+
}))));
|
|
263
|
+
};
|
|
264
|
+
var _calcWorkOrderList = calcWorkOrderList([(data === null || data === void 0 ? void 0 : (_data$data17 = data.data) === null || _data$data17 === void 0 ? void 0 : _data$data17.workOrder) || {}], [].concat(_toConsumableArray((data === null || data === void 0 ? void 0 : (_data$data18 = data.data) === null || _data$data18 === void 0 ? void 0 : (_data$data18$workOrde = _data$data18.workOrderTemplateInfo) === null || _data$data18$workOrde === void 0 ? void 0 : _data$data18$workOrde.preNodeComponentDtoList) || []), _toConsumableArray((data === null || data === void 0 ? void 0 : (_data$data19 = data.data) === null || _data$data19 === void 0 ? void 0 : (_data$data19$workOrde = _data$data19.workOrderTemplateInfo) === null || _data$data19$workOrde === void 0 ? void 0 : _data$data19$workOrde.componentDtoList) || []))),
|
|
258
265
|
_calcWorkOrderList2 = _slicedToArray(_calcWorkOrderList, 1),
|
|
259
266
|
transData = _calcWorkOrderList2[0];
|
|
260
267
|
return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Header, {
|
|
261
268
|
tag: tag,
|
|
262
269
|
nodeName: nodeName,
|
|
263
270
|
editing: editing,
|
|
264
|
-
showLook: isArtificialNode,
|
|
271
|
+
showLook: isArtificialNode || isAutoNode,
|
|
265
272
|
showEdit: showEdit,
|
|
266
273
|
opening: open,
|
|
267
274
|
handleLook: handleOpen,
|
|
@@ -282,18 +289,18 @@ var NodeItem = function NodeItem(props) {
|
|
|
282
289
|
display: open ? 'block' : 'none',
|
|
283
290
|
marginTop: '16px'
|
|
284
291
|
}
|
|
285
|
-
}, [NodeType.START_NODE, NodeType.EXECUTE_NODE].includes(data === null || data === void 0 ? void 0 : (_data$
|
|
286
|
-
isShowShopList: NodeType.START_NODE === (data === null || data === void 0 ? void 0 : (_data$
|
|
292
|
+
}, [NodeType.START_NODE, NodeType.EXECUTE_NODE].includes(data === null || data === void 0 ? void 0 : (_data$data20 = data.data) === null || _data$data20 === void 0 ? void 0 : (_data$data20$nodeInfo = _data$data20.nodeInfo) === null || _data$data20$nodeInfo === void 0 ? void 0 : _data$data20$nodeInfo.nodeType) && (data === null || data === void 0 ? void 0 : (_data$data21 = data.data) === null || _data$data21 === void 0 ? void 0 : _data$data21.workOrderTemplateInfo) && /*#__PURE__*/React.createElement("div", null, editing ? /*#__PURE__*/React.createElement(FormRender, {
|
|
293
|
+
isShowShopList: NodeType.START_NODE === (data === null || data === void 0 ? void 0 : (_data$data22 = data.data) === null || _data$data22 === void 0 ? void 0 : (_data$data22$nodeInfo = _data$data22.nodeInfo) === null || _data$data22$nodeInfo === void 0 ? void 0 : _data$data22$nodeInfo.nodeType) && PlatForm.PC === plat.platform,
|
|
287
294
|
plat: plat,
|
|
288
|
-
templateDetail: data === null || data === void 0 ? void 0 : (_data$
|
|
295
|
+
templateDetail: data === null || data === void 0 ? void 0 : (_data$data23 = data.data) === null || _data$data23 === void 0 ? void 0 : _data$data23.workOrderTemplateInfo,
|
|
289
296
|
shopList: shopList,
|
|
290
|
-
record: data === null || data === void 0 ? void 0 : (_data$
|
|
297
|
+
record: data === null || data === void 0 ? void 0 : (_data$data24 = data.data) === null || _data$data24 === void 0 ? void 0 : _data$data24.workOrder,
|
|
291
298
|
accountName: plat.accountName,
|
|
292
299
|
form: form,
|
|
293
300
|
onOpenWangWang: onOpenWangWang,
|
|
294
301
|
onJumpPage: onJumpPage,
|
|
295
302
|
look: !editing || flowStatus === FlowStatus.STOPPING,
|
|
296
|
-
shopId: data === null || data === void 0 ? void 0 : (_data$
|
|
303
|
+
shopId: data === null || data === void 0 ? void 0 : (_data$data25 = data.data) === null || _data$data25 === void 0 ? void 0 : (_data$data25$workOrde = _data$data25.workOrder) === null || _data$data25$workOrde === void 0 ? void 0 : _data$data25$workOrde.shopId,
|
|
297
304
|
formProps: {
|
|
298
305
|
className: 'customizeFormModalClassName',
|
|
299
306
|
layout: 'vertical'
|
|
@@ -303,10 +310,10 @@ var NodeItem = function NodeItem(props) {
|
|
|
303
310
|
firstOrderBackfill: false // TODO: 前面节点必然是已完成状态，已完成状态不再调用订单反填
|
|
304
311
|
// handleChangeTradeId={handleChangeTradeId}
|
|
305
312
|
}) : /*#__PURE__*/React.createElement(RenderDetail, {
|
|
306
|
-
workOrderTemplateInfo: data === null || data === void 0 ? void 0 : (_data$
|
|
313
|
+
workOrderTemplateInfo: data === null || data === void 0 ? void 0 : (_data$data26 = data.data) === null || _data$data26 === void 0 ? void 0 : _data$data26.workOrderTemplateInfo,
|
|
307
314
|
transData: transData,
|
|
308
315
|
platform: plat.platform,
|
|
309
316
|
onOpenWangWang: onOpenWangWang
|
|
310
|
-
}))));
|
|
317
|
+
})), isAutoNode && renderAutoNodeDetail()));
|
|
311
318
|
};
|
|
312
319
|
export default NodeItem;
|
|
@@ -137,7 +137,7 @@ var getBasicsOrderInfo = function getBasicsOrderInfo(orderInfo, xiaozhiOrder) {
|
|
|
137
137
|
//订单返填
|
|
138
138
|
export var orderBack = /*#__PURE__*/function () {
|
|
139
139
|
var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
|
|
140
|
-
var order_no, form, propsShopid, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, callbackShopId, setLoading, callKey, shopId, _res$data, res, shopInfo, _res$data3, _res$data4, _res$data5, JOIN_SHOP, hasFlagMap, _ref3, shopSourceStr, _ref3$thirdUserNick, thirdUserNick, thirdShopMainType, _kmVideoComponent$com, _data$value, _data$value3, _jstOrder$value, _jstOrder$value2, _bsOrder$value, _wlnOrder$value, _wdtOrder$value, _bsE3Order$value, _kmOrder$value, _gyOrder$value, _bsOrders$orders, _bsE3Orders$orderList, _wlnOrders$orders, _wdtOrders$trades, _gyOrders$trades, _kmOrders$orderDetail, promise, kmVideoComponent, _yield$Promise$allSet, _yield$Promise$allSet2, data, xiaozhiOrder, jstOrder, bsOrder, wlnOrder, wdtOrder, bsE3Order, kmOrder, gyOrder, kmVideoOrder, _data$value2, orderInfo, jstOrders, bsOrders, wlnOrders, wdtOrders, bsE3Orders, kmOrders, gyOrders, bsInfo, wlnInfo, bsE3Info, wdtInfo, kmInfo, gyInfo, jstInfo, formValue, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, hasSigningDatetime, _signDatetime$data, signDatetime, values, paymentUniqueKey;
|
|
140
|
+
var order_no, form, propsShopid, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, callbackShopId, setLoading, callKey, shopId, _res$data, res, shopInfo, _res$data3, _res$data4, _res$data5, JOIN_SHOP, hasFlagMap, _ref3, shopSourceStr, _ref3$thirdUserNick, thirdUserNick, thirdShopMainType, _kmVideoComponent$com, _data$value, _data$value3, _data$value4, _jstOrder$value, _jstOrder$value2, _bsOrder$value, _wlnOrder$value, _wdtOrder$value, _bsE3Order$value, _kmOrder$value, _gyOrder$value, _bsOrders$orders, _bsE3Orders$orderList, _wlnOrders$orders, _wdtOrders$trades, _gyOrders$trades, _kmOrders$orderDetail, promise, kmVideoComponent, _yield$Promise$allSet, _yield$Promise$allSet2, data, xiaozhiOrder, jstOrder, bsOrder, wlnOrder, wdtOrder, bsE3Order, kmOrder, gyOrder, kmVideoOrder, _data$value2, orderInfo, jstOrders, bsOrders, wlnOrders, wdtOrders, bsE3Orders, kmOrders, gyOrders, bsInfo, wlnInfo, bsE3Info, wdtInfo, kmInfo, gyInfo, jstInfo, formValue, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, hasSigningDatetime, _signDatetime$data, signDatetime, values, paymentUniqueKey;
|
|
141
141
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
142
142
|
while (1) switch (_context.prev = _context.next) {
|
|
143
143
|
case 0:
|
|
@@ -290,56 +290,58 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
290
290
|
if (data !== null && data !== void 0 && (_data$value = data.value) !== null && _data$value !== void 0 && _data$value.message) {
|
|
291
291
|
message.warning(data === null || data === void 0 ? void 0 : (_data$value2 = data.value) === null || _data$value2 === void 0 ? void 0 : _data$value2.message);
|
|
292
292
|
}
|
|
293
|
-
orderInfo =
|
|
294
|
-
if ([PlatForm.TB].includes(plat.platform)) {
|
|
293
|
+
orderInfo = ((data === null || data === void 0 ? void 0 : (_data$value3 = data.value) === null || _data$value3 === void 0 ? void 0 : _data$value3.data) || (xiaozhiOrder === null || xiaozhiOrder === void 0 ? void 0 : xiaozhiOrder.value)) && getBasicsOrderInfo(data === null || data === void 0 ? void 0 : (_data$value4 = data.value) === null || _data$value4 === void 0 ? void 0 : _data$value4.data, xiaozhiOrder === null || xiaozhiOrder === void 0 ? void 0 : xiaozhiOrder.value); //千牛端优先获取端上买家昵称
|
|
294
|
+
if ([PlatForm.TB].includes(plat.platform) && orderInfo) {
|
|
295
295
|
orderInfo.buyerNick = (plat === null || plat === void 0 ? void 0 : plat.buyerNick) || (orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.buyerNick);
|
|
296
296
|
}
|
|
297
|
-
jstOrders = jstOrder
|
|
297
|
+
jstOrders = (jstOrder === null || jstOrder === void 0 ? void 0 : (_jstOrder$value = jstOrder.value) === null || _jstOrder$value === void 0 ? void 0 : _jstOrder$value.data) && {
|
|
298
298
|
orderList: jstOrder === null || jstOrder === void 0 ? void 0 : (_jstOrder$value2 = jstOrder.value) === null || _jstOrder$value2 === void 0 ? void 0 : _jstOrder$value2.data
|
|
299
|
-
}
|
|
300
|
-
bsOrders =
|
|
301
|
-
wlnOrders =
|
|
302
|
-
wdtOrders =
|
|
303
|
-
bsE3Orders =
|
|
304
|
-
kmOrders =
|
|
305
|
-
gyOrders =
|
|
306
|
-
bsE3Orders.orderList = filterBsE3Orders(bsE3Orders, order_no);
|
|
307
|
-
wdtOrders.trades = filterWdtOrders(wdtOrders, order_no);
|
|
308
|
-
kmOrders.orderDetailDtoList = filterKmOrders(kmOrders, order_no);
|
|
309
|
-
gyOrders.trades = filterGyOrders(gyOrders, order_no);
|
|
310
|
-
jstOrders.trades = filterJstOrders(jstOrders, order_no);
|
|
299
|
+
} || null;
|
|
300
|
+
bsOrders = bsOrder === null || bsOrder === void 0 ? void 0 : (_bsOrder$value = bsOrder.value) === null || _bsOrder$value === void 0 ? void 0 : _bsOrder$value.data;
|
|
301
|
+
wlnOrders = wlnOrder === null || wlnOrder === void 0 ? void 0 : (_wlnOrder$value = wlnOrder.value) === null || _wlnOrder$value === void 0 ? void 0 : _wlnOrder$value.data;
|
|
302
|
+
wdtOrders = wdtOrder === null || wdtOrder === void 0 ? void 0 : (_wdtOrder$value = wdtOrder.value) === null || _wdtOrder$value === void 0 ? void 0 : _wdtOrder$value.data;
|
|
303
|
+
bsE3Orders = bsE3Order === null || bsE3Order === void 0 ? void 0 : (_bsE3Order$value = bsE3Order.value) === null || _bsE3Order$value === void 0 ? void 0 : _bsE3Order$value.data;
|
|
304
|
+
kmOrders = kmOrder === null || kmOrder === void 0 ? void 0 : (_kmOrder$value = kmOrder.value) === null || _kmOrder$value === void 0 ? void 0 : _kmOrder$value.data;
|
|
305
|
+
gyOrders = gyOrder === null || gyOrder === void 0 ? void 0 : (_gyOrder$value = gyOrder.value) === null || _gyOrder$value === void 0 ? void 0 : _gyOrder$value.data;
|
|
306
|
+
if (bsE3Orders) bsE3Orders.orderList = filterBsE3Orders(bsE3Orders, order_no);
|
|
307
|
+
if (wdtOrders) wdtOrders.trades = filterWdtOrders(wdtOrders, order_no);
|
|
308
|
+
if (kmOrders) kmOrders.orderDetailDtoList = filterKmOrders(kmOrders, order_no);
|
|
309
|
+
if (gyOrders) gyOrders.trades = filterGyOrders(gyOrders, order_no);
|
|
310
|
+
if (jstOrders) jstOrders.trades = filterJstOrders(jstOrders, order_no);
|
|
311
311
|
pushGyLog('gyOrders', gyOrders);
|
|
312
312
|
Monitor.automaticReport({
|
|
313
|
-
message: "orderBack:\u8BA2\u5355\u53F7:".concat(order_no, ",\u5E97\u94FAid:").concat(shopId, "
|
|
313
|
+
message: "orderBack:\u8BA2\u5355\u53F7:".concat(order_no, ",\n \u5E97\u94FAid:").concat(shopId, ",\n \u8BA2\u5355\u4FE1\u606F\uFF1A").concat(JSON.stringify(orderInfo || {}), ",\n jst\u4FE1\u606F:").concat(JSON.stringify(jstOrders || {}), ",\n bs\u4FE1\u606F:").concat(JSON.stringify(bsOrders || {}), ",\n wln\u4FE1\u606F:").concat(JSON.stringify(wlnOrders || {}), ",\n wdt\u4FE1\u606F:").concat(JSON.stringify(wdtOrders || {}), ",\n bsE3\u4FE1\u606F:").concat(JSON.stringify(bsE3Orders || {}), ",\n km\u4FE1\u606F:").concat(JSON.stringify(kmOrders || {}), ",\n \u7BA1\u6613\u4FE1\u606F:").concat(JSON.stringify(gyOrders || []), "\n ")
|
|
314
314
|
});
|
|
315
|
-
if (plat !== null && plat !== void 0 && plat.subOrderNo) {
|
|
315
|
+
if (bsOrders && plat !== null && plat !== void 0 && plat.subOrderNo) {
|
|
316
316
|
bsOrders.orders = bsOrders.orders.filter(function (item) {
|
|
317
317
|
return item.billNo === plat.subOrderNo;
|
|
318
318
|
});
|
|
319
319
|
}
|
|
320
|
-
bsInfo = bsOrderTransform({
|
|
320
|
+
bsInfo = bsOrders && bsOrderTransform({
|
|
321
321
|
detail: bsOrders || {}
|
|
322
322
|
});
|
|
323
|
-
wlnInfo = wlnOrderTransform(wlnOrders || {});
|
|
324
|
-
bsE3Info = bsE3OrderTransform(_objectSpread(_objectSpread({}, bsE3Orders), {}, {
|
|
323
|
+
wlnInfo = wlnOrders && wlnOrderTransform(wlnOrders || {});
|
|
324
|
+
bsE3Info = bsE3Orders && bsE3OrderTransform(_objectSpread(_objectSpread({}, bsE3Orders), {}, {
|
|
325
325
|
componentList: templateDetail.componentDtoList,
|
|
326
326
|
orderNo: order_no
|
|
327
327
|
}), form);
|
|
328
|
-
wdtInfo = wdtOrderTransform(_objectSpread(_objectSpread({}, wdtOrders), {}, {
|
|
328
|
+
wdtInfo = wdtOrders && wdtOrderTransform(_objectSpread(_objectSpread({}, wdtOrders), {}, {
|
|
329
329
|
componentList: templateDetail.componentDtoList,
|
|
330
330
|
orderNo: order_no
|
|
331
331
|
}), form);
|
|
332
|
-
kmInfo = kmOrderTransform(_objectSpread(_objectSpread({}, kmOrders), {}, {
|
|
332
|
+
kmInfo = kmOrders && kmOrderTransform(_objectSpread(_objectSpread({}, kmOrders), {}, {
|
|
333
333
|
order_no: order_no,
|
|
334
334
|
componentList: templateDetail.componentDtoList
|
|
335
335
|
}), form);
|
|
336
|
-
kmInfo
|
|
337
|
-
|
|
336
|
+
if (kmInfo) {
|
|
337
|
+
kmInfo.kmVideo = kmVideoOrder === null || kmVideoOrder === void 0 ? void 0 : kmVideoOrder.value;
|
|
338
|
+
}
|
|
339
|
+
gyInfo = gyOrders && gyOrderTransform(_objectSpread(_objectSpread({}, gyOrders), {}, {
|
|
338
340
|
componentList: templateDetail.componentDtoList,
|
|
339
341
|
orderNo: order_no
|
|
340
342
|
}), form);
|
|
341
343
|
pushGyLog('gyInfo', gyInfo);
|
|
342
|
-
jstInfo = jstOrderTransform(_objectSpread(_objectSpread({}, jstOrders), {}, {
|
|
344
|
+
jstInfo = jstOrders && jstOrderTransform(_objectSpread(_objectSpread({}, jstOrders), {}, {
|
|
343
345
|
componentList: templateDetail.componentDtoList,
|
|
344
346
|
orderNo: order_no
|
|
345
347
|
}), form);
|
|
@@ -443,7 +445,7 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
443
445
|
|
|
444
446
|
//获取当前表单字段
|
|
445
447
|
formValue = form.getFieldsValue();
|
|
446
|
-
detail = _objectSpread(_objectSpread({}, orderInfo), {}, {
|
|
448
|
+
detail = _objectSpread(_objectSpread({}, orderInfo || {}), {}, {
|
|
447
449
|
jstOrder: jstInfo,
|
|
448
450
|
bsOrder: bsInfo,
|
|
449
451
|
wlnOrder: wlnInfo,
|
|
@@ -454,6 +456,10 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
454
456
|
});
|
|
455
457
|
pushGyLog('detail', detail);
|
|
456
458
|
//抖音数据特殊处理
|
|
459
|
+
if (!orderInfo) {
|
|
460
|
+
_context.next = 118;
|
|
461
|
+
break;
|
|
462
|
+
}
|
|
457
463
|
if (shopSourceStr === 'FXG') {
|
|
458
464
|
detail = updateDYDetails(detail);
|
|
459
465
|
} else if (shopSourceStr === 'SPH' || shopSourceStr === 'WXXD') {
|
|
@@ -463,7 +469,7 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
463
469
|
hasSelectItem = HasErpItemSelectHandle(templateDetail);
|
|
464
470
|
erpPromiseList = [];
|
|
465
471
|
if (!(shopSourceStr === 'TAOBAO' && hasSelectItem)) {
|
|
466
|
-
_context.next =
|
|
472
|
+
_context.next = 102;
|
|
467
473
|
break;
|
|
468
474
|
}
|
|
469
475
|
list = detail['itemList'];
|
|
@@ -481,10 +487,10 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
481
487
|
resolve({});
|
|
482
488
|
});
|
|
483
489
|
});
|
|
484
|
-
_context.prev =
|
|
485
|
-
_context.next =
|
|
490
|
+
_context.prev = 92;
|
|
491
|
+
_context.next = 95;
|
|
486
492
|
return Promise.all(promises);
|
|
487
|
-
case
|
|
493
|
+
case 95:
|
|
488
494
|
erpPromiseList = _context.sent;
|
|
489
495
|
detail['itemList'] = (_detail$itemList = detail['itemList']) === null || _detail$itemList === void 0 ? void 0 : _detail$itemList.map(function (item, index) {
|
|
490
496
|
return _objectSpread(_objectSpread({}, item), {}, {
|
|
@@ -494,25 +500,25 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
494
500
|
})
|
|
495
501
|
});
|
|
496
502
|
});
|
|
497
|
-
_context.next =
|
|
503
|
+
_context.next = 102;
|
|
498
504
|
break;
|
|
499
|
-
case
|
|
500
|
-
_context.prev =
|
|
501
|
-
_context.t1 = _context["catch"](
|
|
505
|
+
case 99:
|
|
506
|
+
_context.prev = 99;
|
|
507
|
+
_context.t1 = _context["catch"](92);
|
|
502
508
|
console.error('调用erp获取宝贝编码错误', _context.t1);
|
|
503
|
-
case
|
|
509
|
+
case 102:
|
|
504
510
|
// 判断是否存在签收时间组件
|
|
505
511
|
hasSigningDatetime = HasTradeSigningDatetime(templateDetail); // 如存在签收时间组件且订单也有返回相应物流单号跟物流公司编码，则调用接口获取签收时间
|
|
506
512
|
if (!hasSigningDatetime) {
|
|
507
|
-
_context.next =
|
|
513
|
+
_context.next = 118;
|
|
508
514
|
break;
|
|
509
515
|
}
|
|
510
516
|
if (!(orderInfo !== null && orderInfo !== void 0 && orderInfo.expressLogisticsCompany && orderInfo !== null && orderInfo !== void 0 && orderInfo.expressLogisticsCode)) {
|
|
511
|
-
_context.next =
|
|
517
|
+
_context.next = 117;
|
|
512
518
|
break;
|
|
513
519
|
}
|
|
514
|
-
_context.prev =
|
|
515
|
-
_context.next =
|
|
520
|
+
_context.prev = 105;
|
|
521
|
+
_context.next = 108;
|
|
516
522
|
return request({
|
|
517
523
|
url: '/qy/logistics/logisticsSignTime',
|
|
518
524
|
method: 'post',
|
|
@@ -522,23 +528,24 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
522
528
|
mailNo: orderInfo.expressLogisticsCode
|
|
523
529
|
}
|
|
524
530
|
});
|
|
525
|
-
case
|
|
531
|
+
case 108:
|
|
526
532
|
signDatetime = _context.sent;
|
|
527
533
|
detail['tradeSigningDateTime'] = signDatetime === null || signDatetime === void 0 ? void 0 : (_signDatetime$data = signDatetime.data) === null || _signDatetime$data === void 0 ? void 0 : _signDatetime$data.signTime;
|
|
528
|
-
_context.next =
|
|
534
|
+
_context.next = 115;
|
|
529
535
|
break;
|
|
530
|
-
case
|
|
531
|
-
_context.prev =
|
|
532
|
-
_context.t2 = _context["catch"](
|
|
536
|
+
case 112:
|
|
537
|
+
_context.prev = 112;
|
|
538
|
+
_context.t2 = _context["catch"](105);
|
|
533
539
|
console.error('调用签收时间错误', _context.t2);
|
|
534
|
-
case
|
|
535
|
-
_context.next =
|
|
540
|
+
case 115:
|
|
541
|
+
_context.next = 118;
|
|
536
542
|
break;
|
|
537
|
-
case 116:
|
|
538
|
-
detail['tradeSigningDateTime'] = '';
|
|
539
543
|
case 117:
|
|
544
|
+
detail['tradeSigningDateTime'] = '';
|
|
545
|
+
case 118:
|
|
540
546
|
values = orderBackFormValues({
|
|
541
547
|
detail: detail,
|
|
548
|
+
_get_order_fail_: !orderInfo,
|
|
542
549
|
order_no: order_no,
|
|
543
550
|
formValue: formValue,
|
|
544
551
|
templateDetail: templateDetail,
|
|
@@ -580,21 +587,21 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
580
587
|
shopId: shopId
|
|
581
588
|
}));
|
|
582
589
|
callback === null || callback === void 0 ? void 0 : callback(detail, templateDetail);
|
|
583
|
-
_context.next =
|
|
590
|
+
_context.next = 129;
|
|
584
591
|
break;
|
|
585
|
-
case
|
|
586
|
-
_context.prev =
|
|
592
|
+
case 126:
|
|
593
|
+
_context.prev = 126;
|
|
587
594
|
_context.t3 = _context["catch"](25);
|
|
588
595
|
console.error(_context.t3);
|
|
589
|
-
case
|
|
590
|
-
_context.prev =
|
|
596
|
+
case 129:
|
|
597
|
+
_context.prev = 129;
|
|
591
598
|
setLoading === null || setLoading === void 0 ? void 0 : setLoading(false);
|
|
592
|
-
return _context.finish(
|
|
593
|
-
case
|
|
599
|
+
return _context.finish(129);
|
|
600
|
+
case 132:
|
|
594
601
|
case "end":
|
|
595
602
|
return _context.stop();
|
|
596
603
|
}
|
|
597
|
-
}, _callee, null, [[5, 12, 15, 18], [25,
|
|
604
|
+
}, _callee, null, [[5, 12, 15, 18], [25, 126, 129, 132], [92, 99], [105, 112]]);
|
|
598
605
|
}));
|
|
599
606
|
return function orderBack(_x) {
|
|
600
607
|
return _ref2.apply(this, arguments);
|
|
@@ -1570,4 +1570,18 @@ export interface QueryNodeDetailResponse {
|
|
|
1570
1570
|
}[];
|
|
1571
1571
|
[k: string]: any;
|
|
1572
1572
|
};
|
|
1573
|
+
flowEventData?: {
|
|
1574
|
+
eventData?: {
|
|
1575
|
+
businessStatus?: Array<{
|
|
1576
|
+
businessKey: string;
|
|
1577
|
+
businessStatus: number;
|
|
1578
|
+
businessStatusDesc: string;
|
|
1579
|
+
remark: string;
|
|
1580
|
+
}>;
|
|
1581
|
+
otherBusinessData?: {
|
|
1582
|
+
ruleName?: string;
|
|
1583
|
+
passConditionList?: Array<string>;
|
|
1584
|
+
};
|
|
1585
|
+
};
|
|
1586
|
+
};
|
|
1573
1587
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kmkf-fe-packages/kmkf-work-order-service-component",
|
|
3
|
-
"version": "2.0.54-beta.
|
|
3
|
+
"version": "2.0.54-beta.89",
|
|
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": "2.0.54-beta.
|
|
36
|
-
"@kmkf-fe-packages/kmkf-utils": "2.0.54-beta.
|
|
37
|
-
"@kmkf-fe-packages/services-components": "2.0.54-beta.
|
|
35
|
+
"@kmkf-fe-packages/basic-components": "2.0.54-beta.89",
|
|
36
|
+
"@kmkf-fe-packages/kmkf-utils": "2.0.54-beta.89",
|
|
37
|
+
"@kmkf-fe-packages/services-components": "2.0.54-beta.89",
|
|
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": "054496f0ae6357b525e75f1b5d25f018e46be2de",
|
|
77
77
|
"gitHooks": {
|
|
78
78
|
"pre-commit": "lint-staged"
|
|
79
79
|
}
|