@kmkf-fe-packages/kmkf-work-order-service-component 2.2.4 → 2.2.5-beta.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/CustomerServiceToDoList/index.d.ts +3 -0
- package/dist/esm/CustomerServiceToDoList/index.js +155 -0
- package/dist/esm/CustomerServiceToDoList/index.module.less +134 -0
- package/dist/esm/FlowTemplateDetailV2/common.js +1 -0
- package/dist/esm/FlowTemplateDetailV2/components/ActionList/index.d.ts +2 -0
- package/dist/esm/FlowTemplateDetailV2/components/ActionList/index.js +50 -8
- package/dist/esm/FlowTemplateDetailV2/components/FormRender/index.js +66 -17
- package/dist/esm/FlowTemplateDetailV2/components/FormRender/onBlur.d.ts +12 -0
- package/dist/esm/FlowTemplateDetailV2/components/FormRender/onBlur.js +176 -44
- package/dist/esm/FlowTemplateDetailV2/components/Header/index.js +5 -2
- package/dist/esm/FlowTemplateDetailV2/components/ShareLinkModal/index.d.ts +4 -0
- package/dist/esm/FlowTemplateDetailV2/components/ShareLinkModal/index.js +211 -0
- package/dist/esm/FlowTemplateDetailV2/components/ShareLinkModal/index.module.less +29 -0
- package/dist/esm/FlowTemplateDetailV2/constant.js +9 -1
- package/dist/esm/FlowTemplateDetailV2/index.js +151 -78
- package/dist/esm/FlowTemplateDetailV2/store/reducers.d.ts +8 -0
- package/dist/esm/FlowTemplateDetailV2/store/reducers.js +152 -54
- package/dist/esm/FlowTemplateDetailV2/store/selector.d.ts +3 -0
- package/dist/esm/FlowTemplateDetailV2/store/selector.js +9 -0
- package/dist/esm/FlowTemplateDetailV2/type.d.ts +1 -1
- package/dist/esm/Login/index.d.ts +1 -0
- package/dist/esm/Login/index.js +3 -1
- package/dist/esm/LoginNew/index.d.ts +8 -0
- package/dist/esm/LoginNew/index.js +268 -0
- package/dist/esm/LoginNew/index.module.less +45 -0
- package/dist/esm/WorkOrder/components/CustomerServiceToDoCard/index.d.ts +3 -0
- package/dist/esm/WorkOrder/components/CustomerServiceToDoCard/index.js +76 -0
- package/dist/esm/WorkOrder/components/CustomerServiceToDoCard/index.module.less +20 -0
- package/dist/esm/WorkOrder/components/WorkOrderList/components/CustomizeWorkOrderCard/index.js +6 -0
- package/dist/esm/WorkOrder/components/WorkOrderList/index.js +12 -3
- package/dist/esm/WorkOrder/components/WorkOrderList/index.less +4 -3
- package/dist/esm/WorkOrder/index.js +21 -1
- package/dist/esm/common/constant.d.ts +5 -0
- package/dist/esm/common/constant.js +3 -2
- package/dist/esm/common/imgs/ai.png +0 -0
- package/dist/esm/common/imgs/notification.png +0 -0
- package/dist/esm/common/utils/constant.d.ts +3 -0
- package/dist/esm/common/utils/constant.js +33 -2
- package/dist/esm/common/utils/submitDataTransOldFormat.js +146 -79
- package/dist/esm/common/utils/tools.d.ts +1 -0
- package/dist/esm/common/utils/tools.js +145 -48
- package/dist/esm/common/utils/tools_constants.js +21 -2
- package/dist/esm/common/utils/transformWorkOrderData.js +99 -19
- package/dist/esm/common/utils/xzSDK.d.ts +2 -0
- package/dist/esm/common/utils/xzSDK.js +45 -1
- package/dist/esm/index.d.ts +2 -0
- package/dist/esm/index.js +2 -0
- package/dist/esm/model/customizeWorkOrder/index.d.ts +1 -1
- package/dist/esm/model/customizeWorkOrder/index.js +17 -3
- package/dist/esm/model/customizeWorkOrder/types.d.ts +2 -0
- package/dist/esm/model/flowTemplateDetail/api.d.ts +5 -0
- package/dist/esm/model/flowTemplateDetail/api.js +40 -0
- package/dist/esm/model/flowTemplateDetail/types.d.ts +4 -0
- package/dist/esm/model/logicFlow/selector.d.ts +3 -0
- package/dist/esm/model/login.d.ts +10 -0
- package/dist/esm/model/login.js +66 -45
- package/dist/esm/model/paymentWorkOrder/selector.d.ts +9 -0
- package/dist/esm/model/servers/api.d.ts +5 -0
- package/dist/esm/model/servers/api.js +37 -3
- package/dist/esm/model/singleShopWorkOrder/selector.d.ts +5 -0
- package/package.json +6 -5
- package/dist/esm/GlobalContext/hook/dist/useGetHasErpData.js +0 -52
- package/dist/esm/GlobalContext/orderQuery/dist/useGetErpAddressData.js +0 -180
- package/dist/esm/GlobalContext/orderQuery/dist/useGetErpLogisticsCompany.js +0 -186
- package/dist/esm/common/utils/dist/submitDataTransOldFormat.js +0 -899
- package/dist/esm/common/utils/dist/tools.js +0 -1326
- package/dist/esm/common/utils/dist/transformWorkOrderData.js +0 -965
- package/dist/esm/model/customizeWorkOrder/dist/api.js +0 -48
- package/dist/esm/model/customizeWorkOrder/dist/index.js +0 -370
- package/dist/esm/model/customizeWorkOrder/dist/selector.js +0 -63
- package/dist/esm/model/customizeWorkOrder/dist/types.js +0 -3
- package/dist/esm/model/dist/global.js +0 -44
- package/dist/esm/model/dist/hooks.js +0 -15
- package/dist/esm/model/dist/login.js +0 -245
- package/dist/esm/model/dist/store.js +0 -30
- package/dist/esm/model/dist/userData.js +0 -41
- package/dist/esm/model/dist/workOrder.js +0 -329
- package/dist/esm/model/flowTemplateDetail/dist/api.js +0 -192
- package/dist/esm/model/flowTemplateDetail/dist/types.js +0 -48
- package/dist/esm/model/logicFlow/dist/api.js +0 -14
- package/dist/esm/model/logicFlow/dist/index.js +0 -235
- package/dist/esm/model/logicFlow/dist/selector.js +0 -18
- package/dist/esm/model/logicFlow/dist/types.js +0 -3
- package/dist/esm/model/paymentWorkOrder/dist/index.js +0 -77
- package/dist/esm/model/paymentWorkOrder/dist/selector.js +0 -36
- package/dist/esm/model/paymentWorkOrder/dist/types.js +0 -3
- package/dist/esm/model/servers/dist/api.js +0 -545
- package/dist/esm/model/servers/dist/request.js +0 -63
- package/dist/esm/model/singleShopWorkOrder/dist/index.js +0 -216
- package/dist/esm/model/singleShopWorkOrder/dist/selector.js +0 -24
- package/dist/esm/model/singleShopWorkOrder/dist/types.js +0 -3
- package/dist/esm/model/types/dist/login.js +0 -3
- package/dist/esm/model/types/dist/singleWorkOrder.js +0 -3
- package/dist/esm/model/types/dist/workOrder.js +0 -3
|
@@ -21,7 +21,7 @@ import { message } from 'antd';
|
|
|
21
21
|
import { get, last, cloneDeep, isEqual, set } from 'lodash';
|
|
22
22
|
import { orderDetail, queryShopByTid } from "../../model/servers/api";
|
|
23
23
|
import moment from 'moment';
|
|
24
|
-
import { AddressData, ExpressData, ExpressInterceptData, orderBackFormValues, bsOrderBackFormValues, kmOrderBackFormValues, bsE3OrderBackFormValues, wlnOrderBackFormValues, wdtOrderBackFormValues, jstOrderBackFormValues, request, isNull, bsOrderTransform, bsE3OrderTransform, jstOrderTransform, filterJstOrders, wlnOrderTransform, wdtOrderTransform, kmOrderTransform, filterBsE3Orders, filterWdtOrders, filterKmOrders, unTransField, transMultSelectOptions, gyOrderBackFormValues, gyOrderTransform, filterGyOrders, setSessionStorage, skxOrderTransform } from '@kmkf-fe-packages/kmkf-utils';
|
|
24
|
+
import { AddressData, ExpressData, ExpressInterceptData, orderBackFormValues, bsOrderBackFormValues, kmOrderBackFormValues, bsE3OrderBackFormValues, wlnOrderBackFormValues, wdtOrderBackFormValues, jstOrderBackFormValues, request, isNull, bsOrderTransform, bsE3OrderTransform, jstOrderTransform, filterJstOrders, wlnOrderTransform, wdtOrderTransform, kmOrderTransform, filterBsE3Orders, filterWdtOrders, filterKmOrders, unTransField, transMultSelectOptions, gyOrderBackFormValues, gyOrderTransform, filterGyOrders, filterJyOrders, setSessionStorage, jyOrderTransform, jyOrderBackFormValues, skxOrderTransform, orderSubFormOrderTransform, skxReturnOrderTransform } from '@kmkf-fe-packages/kmkf-utils';
|
|
25
25
|
import Monitor from 'kmkf-monitor';
|
|
26
26
|
import { PlatForm } from "../../model/flowTemplateDetail/types";
|
|
27
27
|
import transformWorkOrderData from "./transformWorkOrderData";
|
|
@@ -63,7 +63,8 @@ var workTypeKeys = {
|
|
|
63
63
|
NEW_PAYMENT_STATUS: 'newPaymentStatus',
|
|
64
64
|
BUSINESS_ORDER_NO: 'businessOrderNo',
|
|
65
65
|
PAYMENT_VOUCHER_CODE: 'paymentVoucherCode',
|
|
66
|
-
EXECUTE_ACTION_TYPE: 'executeActionType'
|
|
66
|
+
EXECUTE_ACTION_TYPE: 'executeActionType',
|
|
67
|
+
ERP_ORDER_STATUS: 'erpOrderStatus'
|
|
67
68
|
};
|
|
68
69
|
|
|
69
70
|
// 根据组件类型获取组件的UniqueKey
|
|
@@ -139,7 +140,7 @@ var getBasicsOrderInfo = function getBasicsOrderInfo(orderInfo, xiaozhiOrder) {
|
|
|
139
140
|
//订单返填
|
|
140
141
|
export var orderBack = /*#__PURE__*/function () {
|
|
141
142
|
var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
|
|
142
|
-
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, _skxOrder$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, skxOrder, kmVideoOrder, _data$value2, orderInfo, jstOrders, bsOrders, wlnOrders, wdtOrders, bsE3Orders, kmOrders, gyOrders, skxOrders, bsInfo, wlnInfo, bsE3Info, wdtInfo, kmInfo, gyInfo, jstInfo, skxInfo, formValue, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, hasSigningDatetime, _signDatetime$data, signDatetime, values, paymentUniqueKey;
|
|
143
|
+
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, _jyOrder$value, _skxOrder$value, _skxReturnOrder$value, _bsOrders$orders, _bsE3Orders$orderList, _wlnOrders$orders, _wdtOrders$trades, _gyOrders$trades, _jyOrders$trades, _kmOrders$orderDetail, promise, kmVideoComponent, OrderSubFormComponent, _yield$Promise$allSet, _yield$Promise$allSet2, data, xiaozhiOrder, jstOrder, bsOrder, wlnOrder, wdtOrder, bsE3Order, kmOrder, gyOrder, jyOrder, skxOrder, skxReturnOrder, kmVideoOrder, orderSubFormOrder, _data$value2, orderInfo, jstOrders, bsOrders, wlnOrders, wdtOrders, bsE3Orders, kmOrders, gyOrders, jyOrders, skxOrders, skxReturnOrders, bsInfo, wlnInfo, bsE3Info, wdtInfo, kmInfo, orderSubFormInfo, gyInfo, jyInfo, jstInfo, skxInfo, skxReturnInfo, formValue, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, hasSigningDatetime, _signDatetime$data, signDatetime, values, paymentUniqueKey;
|
|
143
144
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
144
145
|
while (1) switch (_context.prev = _context.next) {
|
|
145
146
|
case 0:
|
|
@@ -258,13 +259,25 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
258
259
|
} else {
|
|
259
260
|
promise.push(Promise.resolve([]));
|
|
260
261
|
}
|
|
262
|
+
// 子订单根据订单号/店铺获取
|
|
263
|
+
OrderSubFormComponent = templateDetail.componentDtoList.find(function (item) {
|
|
264
|
+
return item.workOrderComponentType === 'ORDER_SUBFORM';
|
|
265
|
+
});
|
|
266
|
+
if (OrderSubFormComponent) {
|
|
267
|
+
promise.push(servers.orderSubForm.getOrderSubFormDataAsync({
|
|
268
|
+
orderNo: order_no,
|
|
269
|
+
shopId: shopId
|
|
270
|
+
}));
|
|
271
|
+
} else {
|
|
272
|
+
promise.push(Promise.resolve([]));
|
|
273
|
+
}
|
|
261
274
|
|
|
262
275
|
//需按照orderBackMap中的顺序结构
|
|
263
|
-
_context.next =
|
|
276
|
+
_context.next = 36;
|
|
264
277
|
return Promise.allSettled(promise);
|
|
265
|
-
case
|
|
278
|
+
case 36:
|
|
266
279
|
_yield$Promise$allSet = _context.sent;
|
|
267
|
-
_yield$Promise$allSet2 = _slicedToArray(_yield$Promise$allSet,
|
|
280
|
+
_yield$Promise$allSet2 = _slicedToArray(_yield$Promise$allSet, 14);
|
|
268
281
|
data = _yield$Promise$allSet2[0];
|
|
269
282
|
xiaozhiOrder = _yield$Promise$allSet2[1];
|
|
270
283
|
jstOrder = _yield$Promise$allSet2[2];
|
|
@@ -274,8 +287,11 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
274
287
|
bsE3Order = _yield$Promise$allSet2[6];
|
|
275
288
|
kmOrder = _yield$Promise$allSet2[7];
|
|
276
289
|
gyOrder = _yield$Promise$allSet2[8];
|
|
277
|
-
|
|
278
|
-
|
|
290
|
+
jyOrder = _yield$Promise$allSet2[9];
|
|
291
|
+
skxOrder = _yield$Promise$allSet2[10];
|
|
292
|
+
skxReturnOrder = _yield$Promise$allSet2[11];
|
|
293
|
+
kmVideoOrder = _yield$Promise$allSet2[12];
|
|
294
|
+
orderSubFormOrder = _yield$Promise$allSet2[13];
|
|
279
295
|
// TODO: 针对订单支付方式是微信还是支付宝,后端接口返回一个message用来提示使用
|
|
280
296
|
console.log('--订单反填数据--', {
|
|
281
297
|
data: data,
|
|
@@ -287,8 +303,11 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
287
303
|
bsE3Order: bsE3Order,
|
|
288
304
|
kmOrder: kmOrder,
|
|
289
305
|
gyOrder: gyOrder,
|
|
306
|
+
jyOrder: jyOrder,
|
|
290
307
|
skxOrder: skxOrder,
|
|
291
|
-
|
|
308
|
+
skxReturnOrder: skxReturnOrder,
|
|
309
|
+
kmVideoOrder: kmVideoOrder,
|
|
310
|
+
orderSubFormOrder: orderSubFormOrder
|
|
292
311
|
});
|
|
293
312
|
pushGyLog('gyOrder', gyOrder);
|
|
294
313
|
if (data !== null && data !== void 0 && (_data$value = data.value) !== null && _data$value !== void 0 && _data$value.message) {
|
|
@@ -307,7 +326,9 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
307
326
|
bsE3Orders = bsE3Order === null || bsE3Order === void 0 ? void 0 : (_bsE3Order$value = bsE3Order.value) === null || _bsE3Order$value === void 0 ? void 0 : _bsE3Order$value.data;
|
|
308
327
|
kmOrders = kmOrder === null || kmOrder === void 0 ? void 0 : (_kmOrder$value = kmOrder.value) === null || _kmOrder$value === void 0 ? void 0 : _kmOrder$value.data;
|
|
309
328
|
gyOrders = gyOrder === null || gyOrder === void 0 ? void 0 : (_gyOrder$value = gyOrder.value) === null || _gyOrder$value === void 0 ? void 0 : _gyOrder$value.data;
|
|
329
|
+
jyOrders = jyOrder === null || jyOrder === void 0 ? void 0 : (_jyOrder$value = jyOrder.value) === null || _jyOrder$value === void 0 ? void 0 : _jyOrder$value.data;
|
|
310
330
|
skxOrders = skxOrder === null || skxOrder === void 0 ? void 0 : (_skxOrder$value = skxOrder.value) === null || _skxOrder$value === void 0 ? void 0 : _skxOrder$value.data;
|
|
331
|
+
skxReturnOrders = skxReturnOrder === null || skxReturnOrder === void 0 ? void 0 : (_skxReturnOrder$value = skxReturnOrder.value) === null || _skxReturnOrder$value === void 0 ? void 0 : _skxReturnOrder$value.data;
|
|
311
332
|
console.log('skxOrders', {
|
|
312
333
|
skxOrders: skxOrders,
|
|
313
334
|
skxOrder: skxOrder
|
|
@@ -317,10 +338,12 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
317
338
|
if (kmOrders) kmOrders.orderDetailDtoList = filterKmOrders(kmOrders, order_no);
|
|
318
339
|
if (gyOrders) gyOrders.trades = filterGyOrders(gyOrders, order_no);
|
|
319
340
|
if (jstOrders) jstOrders.trades = filterJstOrders(jstOrders, order_no);
|
|
341
|
+
if (jyOrders) jyOrders.trades = filterJyOrders(jyOrders, order_no);
|
|
320
342
|
if (skxOrders) skxOrders.trades = (skxOrders === null || skxOrders === void 0 ? void 0 : skxOrders.orderDetailInfoList) || []; //需要看实际接口返回字段
|
|
343
|
+
if (skxReturnOrders) skxReturnOrders.trades = (skxReturnOrders === null || skxReturnOrders === void 0 ? void 0 : skxReturnOrders.skqReturnOrderDetailInfoDtos) || [];
|
|
321
344
|
pushGyLog('gyOrders', gyOrders);
|
|
322
345
|
Monitor.automaticReport({
|
|
323
|
-
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 ")
|
|
346
|
+
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 skxReturn\u4FE1\u606F:").concat(JSON.stringify(skxReturnOrders || {}), ",\n \u7BA1\u6613\u4FE1\u606F:").concat(JSON.stringify(gyOrders || []), "\n \u5DE8\u76CA\u4FE1\u606F:").concat(JSON.stringify(jyOrders || []), "\n ")
|
|
324
347
|
});
|
|
325
348
|
if (bsOrders && plat !== null && plat !== void 0 && plat.subOrderNo) {
|
|
326
349
|
bsOrders.orders = bsOrders.orders.filter(function (item) {
|
|
@@ -351,12 +374,23 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
351
374
|
if (kmInfo) {
|
|
352
375
|
kmInfo.kmVideo = kmVideoOrder === null || kmVideoOrder === void 0 ? void 0 : kmVideoOrder.value;
|
|
353
376
|
}
|
|
377
|
+
orderSubFormInfo = orderSubFormOrderTransform({
|
|
378
|
+
subOrderList: (orderSubFormOrder === null || orderSubFormOrder === void 0 ? void 0 : orderSubFormOrder.value) || [],
|
|
379
|
+
orderNo: order_no,
|
|
380
|
+
allOrders: (orderSubFormOrder === null || orderSubFormOrder === void 0 ? void 0 : orderSubFormOrder.value) || [],
|
|
381
|
+
shopId: shopId
|
|
382
|
+
});
|
|
354
383
|
gyInfo = gyOrders && gyOrderTransform(_objectSpread(_objectSpread({}, gyOrders), {}, {
|
|
355
384
|
allOrders: gyOrders === null || gyOrders === void 0 ? void 0 : gyOrders.trades,
|
|
356
385
|
componentList: templateDetail.componentDtoList,
|
|
357
386
|
orderNo: order_no
|
|
358
387
|
}), form);
|
|
359
388
|
pushGyLog('gyInfo', gyInfo);
|
|
389
|
+
jyInfo = jyOrders && jyOrderTransform(_objectSpread(_objectSpread({}, jyOrders), {}, {
|
|
390
|
+
allOrders: jyOrders === null || jyOrders === void 0 ? void 0 : jyOrders.trades,
|
|
391
|
+
componentList: templateDetail.componentDtoList,
|
|
392
|
+
orderNo: order_no
|
|
393
|
+
}), form);
|
|
360
394
|
jstInfo = jstOrders && jstOrderTransform(_objectSpread(_objectSpread({}, jstOrders), {}, {
|
|
361
395
|
componentList: templateDetail.componentDtoList,
|
|
362
396
|
orderNo: order_no,
|
|
@@ -367,6 +401,11 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
367
401
|
orderNo: order_no,
|
|
368
402
|
allOrders: (skxOrders === null || skxOrders === void 0 ? void 0 : skxOrders.trades) || []
|
|
369
403
|
}), form);
|
|
404
|
+
skxReturnInfo = skxReturnOrders && skxReturnOrderTransform(_objectSpread(_objectSpread({}, skxReturnOrders), {}, {
|
|
405
|
+
componentList: templateDetail.componentDtoList,
|
|
406
|
+
orderNo: order_no,
|
|
407
|
+
allOrders: (skxReturnOrders === null || skxReturnOrders === void 0 ? void 0 : skxReturnOrders.trades) || []
|
|
408
|
+
}), form);
|
|
370
409
|
if ((bsOrders === null || bsOrders === void 0 ? void 0 : (_bsOrders$orders = bsOrders.orders) === null || _bsOrders$orders === void 0 ? void 0 : _bsOrders$orders.length) > 1) {
|
|
371
410
|
bsInfo.bsGoods = _objectSpread(_objectSpread({}, bsInfo.bsGoods), {}, {
|
|
372
411
|
bsGoods: []
|
|
@@ -437,6 +476,20 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
437
476
|
}];
|
|
438
477
|
pushGyLog('gyInfo_after', gyInfo);
|
|
439
478
|
}
|
|
479
|
+
if ((jyOrders === null || jyOrders === void 0 ? void 0 : (_jyOrders$trades = jyOrders.trades) === null || _jyOrders$trades === void 0 ? void 0 : _jyOrders$trades.length) > 1) {
|
|
480
|
+
jyInfo.jyGoods = _objectSpread(_objectSpread({}, jyInfo.jyGoods), {}, {
|
|
481
|
+
jyGoods: [],
|
|
482
|
+
orders: []
|
|
483
|
+
});
|
|
484
|
+
jyInfo.jyLogistics = [{
|
|
485
|
+
logisticsCompany: null,
|
|
486
|
+
logisticsCode: ''
|
|
487
|
+
}];
|
|
488
|
+
jyInfo.jySendGood = [{
|
|
489
|
+
sendId: '',
|
|
490
|
+
sendName: ''
|
|
491
|
+
}];
|
|
492
|
+
}
|
|
440
493
|
if ((kmOrders === null || kmOrders === void 0 ? void 0 : (_kmOrders$orderDetail = kmOrders.orderDetailDtoList) === null || _kmOrders$orderDetail === void 0 ? void 0 : _kmOrders$orderDetail.length) > 1) {
|
|
441
494
|
kmInfo.kmSendGood = [{
|
|
442
495
|
sendId: '',
|
|
@@ -474,6 +527,13 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
474
527
|
logisticsCode: ''
|
|
475
528
|
}];
|
|
476
529
|
}
|
|
530
|
+
// if (skxReturnOrders?.trades && skxReturnOrders.trades.length > 1) {
|
|
531
|
+
// skxReturnInfo.skxReturnGoods = {
|
|
532
|
+
// ...skxReturnInfo.skxReturnGoods,
|
|
533
|
+
// skxReturnGoods: [],
|
|
534
|
+
// };
|
|
535
|
+
// skxReturnInfo.skxLogistics = [{ logisticsCompany: null, logisticsCode: '' }];
|
|
536
|
+
// }
|
|
477
537
|
|
|
478
538
|
//获取当前表单字段
|
|
479
539
|
formValue = form.getFieldsValue();
|
|
@@ -485,12 +545,15 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
485
545
|
bsE3Order: bsE3Info,
|
|
486
546
|
kmOrder: kmInfo,
|
|
487
547
|
gyOrder: gyInfo,
|
|
488
|
-
|
|
548
|
+
jyOrder: jyInfo,
|
|
549
|
+
skxOrder: skxInfo,
|
|
550
|
+
orderSubFormOrder: orderSubFormInfo,
|
|
551
|
+
skxReturnOrder: skxReturnInfo
|
|
489
552
|
});
|
|
490
553
|
pushGyLog('detail', detail);
|
|
491
554
|
//抖音数据特殊处理
|
|
492
555
|
if (!orderInfo) {
|
|
493
|
-
_context.next =
|
|
556
|
+
_context.next = 137;
|
|
494
557
|
break;
|
|
495
558
|
}
|
|
496
559
|
if (shopSourceStr === 'FXG') {
|
|
@@ -502,7 +565,7 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
502
565
|
hasSelectItem = HasErpItemSelectHandle(templateDetail);
|
|
503
566
|
erpPromiseList = [];
|
|
504
567
|
if (!(shopSourceStr === 'TAOBAO' && hasSelectItem)) {
|
|
505
|
-
_context.next =
|
|
568
|
+
_context.next = 121;
|
|
506
569
|
break;
|
|
507
570
|
}
|
|
508
571
|
list = detail['itemList'];
|
|
@@ -520,10 +583,10 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
520
583
|
resolve({});
|
|
521
584
|
});
|
|
522
585
|
});
|
|
523
|
-
_context.prev =
|
|
524
|
-
_context.next =
|
|
586
|
+
_context.prev = 111;
|
|
587
|
+
_context.next = 114;
|
|
525
588
|
return Promise.all(promises);
|
|
526
|
-
case
|
|
589
|
+
case 114:
|
|
527
590
|
erpPromiseList = _context.sent;
|
|
528
591
|
detail['itemList'] = (_detail$itemList = detail['itemList']) === null || _detail$itemList === void 0 ? void 0 : _detail$itemList.map(function (item, index) {
|
|
529
592
|
return _objectSpread(_objectSpread({}, item), {}, {
|
|
@@ -533,25 +596,25 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
533
596
|
})
|
|
534
597
|
});
|
|
535
598
|
});
|
|
536
|
-
_context.next =
|
|
599
|
+
_context.next = 121;
|
|
537
600
|
break;
|
|
538
|
-
case
|
|
539
|
-
_context.prev =
|
|
540
|
-
_context.t1 = _context["catch"](
|
|
601
|
+
case 118:
|
|
602
|
+
_context.prev = 118;
|
|
603
|
+
_context.t1 = _context["catch"](111);
|
|
541
604
|
console.error('调用erp获取宝贝编码错误', _context.t1);
|
|
542
|
-
case
|
|
605
|
+
case 121:
|
|
543
606
|
// 判断是否存在签收时间组件
|
|
544
607
|
hasSigningDatetime = HasTradeSigningDatetime(templateDetail); // 如存在签收时间组件且订单也有返回相应物流单号跟物流公司编码,则调用接口获取签收时间
|
|
545
608
|
if (!hasSigningDatetime) {
|
|
546
|
-
_context.next =
|
|
609
|
+
_context.next = 137;
|
|
547
610
|
break;
|
|
548
611
|
}
|
|
549
612
|
if (!(orderInfo !== null && orderInfo !== void 0 && orderInfo.expressLogisticsCompany && orderInfo !== null && orderInfo !== void 0 && orderInfo.expressLogisticsCode)) {
|
|
550
|
-
_context.next =
|
|
613
|
+
_context.next = 136;
|
|
551
614
|
break;
|
|
552
615
|
}
|
|
553
|
-
_context.prev =
|
|
554
|
-
_context.next =
|
|
616
|
+
_context.prev = 124;
|
|
617
|
+
_context.next = 127;
|
|
555
618
|
return request({
|
|
556
619
|
url: '/qy/logistics/logisticsSignTime',
|
|
557
620
|
method: 'post',
|
|
@@ -561,21 +624,21 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
561
624
|
mailNo: orderInfo.expressLogisticsCode
|
|
562
625
|
}
|
|
563
626
|
});
|
|
564
|
-
case
|
|
627
|
+
case 127:
|
|
565
628
|
signDatetime = _context.sent;
|
|
566
629
|
detail['tradeSigningDateTime'] = signDatetime === null || signDatetime === void 0 ? void 0 : (_signDatetime$data = signDatetime.data) === null || _signDatetime$data === void 0 ? void 0 : _signDatetime$data.signTime;
|
|
567
|
-
_context.next =
|
|
630
|
+
_context.next = 134;
|
|
568
631
|
break;
|
|
569
|
-
case
|
|
570
|
-
_context.prev =
|
|
571
|
-
_context.t2 = _context["catch"](
|
|
632
|
+
case 131:
|
|
633
|
+
_context.prev = 131;
|
|
634
|
+
_context.t2 = _context["catch"](124);
|
|
572
635
|
console.error('调用签收时间错误', _context.t2);
|
|
573
|
-
case
|
|
574
|
-
_context.next =
|
|
636
|
+
case 134:
|
|
637
|
+
_context.next = 137;
|
|
575
638
|
break;
|
|
576
|
-
case
|
|
639
|
+
case 136:
|
|
577
640
|
detail['tradeSigningDateTime'] = '';
|
|
578
|
-
case
|
|
641
|
+
case 137:
|
|
579
642
|
values = orderBackFormValues({
|
|
580
643
|
detail: detail,
|
|
581
644
|
_get_order_fail_: !orderInfo,
|
|
@@ -620,21 +683,21 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
620
683
|
shopId: shopId
|
|
621
684
|
}));
|
|
622
685
|
callback === null || callback === void 0 ? void 0 : callback(detail, templateDetail);
|
|
623
|
-
_context.next =
|
|
686
|
+
_context.next = 148;
|
|
624
687
|
break;
|
|
625
|
-
case
|
|
626
|
-
_context.prev =
|
|
688
|
+
case 145:
|
|
689
|
+
_context.prev = 145;
|
|
627
690
|
_context.t3 = _context["catch"](25);
|
|
628
691
|
console.error(_context.t3);
|
|
629
|
-
case
|
|
630
|
-
_context.prev =
|
|
692
|
+
case 148:
|
|
693
|
+
_context.prev = 148;
|
|
631
694
|
setLoading === null || setLoading === void 0 ? void 0 : setLoading(false);
|
|
632
|
-
return _context.finish(
|
|
633
|
-
case
|
|
695
|
+
return _context.finish(148);
|
|
696
|
+
case 151:
|
|
634
697
|
case "end":
|
|
635
698
|
return _context.stop();
|
|
636
699
|
}
|
|
637
|
-
}, _callee, null, [[5, 12, 15, 18], [25,
|
|
700
|
+
}, _callee, null, [[5, 12, 15, 18], [25, 145, 148, 151], [111, 118], [124, 131]]);
|
|
638
701
|
}));
|
|
639
702
|
return function orderBack(_x) {
|
|
640
703
|
return _ref2.apply(this, arguments);
|
|
@@ -987,6 +1050,10 @@ export var reversalFormValues = function reversalFormValues() {
|
|
|
987
1050
|
prv["".concat(next.uniqueKey, "_gyGoods")] = JSON.stringify(values[next.uniqueKey]['_gyGoods']);
|
|
988
1051
|
prv["".concat(next.uniqueKey, "_shopCode")] = values[next.uniqueKey]['shopCode'];
|
|
989
1052
|
break;
|
|
1053
|
+
case 'JY_GOODS':
|
|
1054
|
+
prv["".concat(next.uniqueKey, "_jyGoods")] = JSON.stringify(values[next.uniqueKey]['_jyGoods']);
|
|
1055
|
+
prv["".concat(next.uniqueKey, "_shopCode")] = values[next.uniqueKey]['shopCode'];
|
|
1056
|
+
break;
|
|
990
1057
|
case 'JST_GOODS':
|
|
991
1058
|
prv["".concat(next.uniqueKey, "_jstGoods")] = JSON.stringify(values[next.uniqueKey]['_jstGoods']);
|
|
992
1059
|
prv["".concat(next.uniqueKey, "_shopCode")] = values[next.uniqueKey]['shopCode'];
|
|
@@ -1001,6 +1068,9 @@ export var reversalFormValues = function reversalFormValues() {
|
|
|
1001
1068
|
case 'SKX_GOODS':
|
|
1002
1069
|
prv["".concat(next.uniqueKey, "_skxGoods")] = JSON.stringify(values[next.uniqueKey]['_skxGoods']);
|
|
1003
1070
|
break;
|
|
1071
|
+
case 'SKX_RETURN_GOODS':
|
|
1072
|
+
prv["".concat(next.uniqueKey, "_skxReturnGoods")] = JSON.stringify(values[next.uniqueKey]['_skxReturnGoods']);
|
|
1073
|
+
break;
|
|
1004
1074
|
}
|
|
1005
1075
|
return prv;
|
|
1006
1076
|
}, {});
|
|
@@ -1226,6 +1296,33 @@ export var jstSystemOrderBackValues = function jstSystemOrderBackValues(_ref12)
|
|
|
1226
1296
|
});
|
|
1227
1297
|
form.setFieldsValue(values);
|
|
1228
1298
|
};
|
|
1299
|
+
// 巨益商品信息反填
|
|
1300
|
+
export var jySystemOrderBackValues = function jySystemOrderBackValues(_ref13) {
|
|
1301
|
+
var _templateList$compone13, _templateList$compone14;
|
|
1302
|
+
var templateList = _ref13.templateList,
|
|
1303
|
+
value = _ref13.value,
|
|
1304
|
+
form = _ref13.form;
|
|
1305
|
+
//如果没有选择的值不返填,会有两种情况 1.有值为空 2.没有值 为空的时候需要返填
|
|
1306
|
+
if (!(value !== null && value !== void 0 && value.selectedRows)) return;
|
|
1307
|
+
var jyGoodsComponent = (_templateList$compone13 = templateList.componentDtoList) === null || _templateList$compone13 === void 0 ? void 0 : _templateList$compone13.filter(function (item) {
|
|
1308
|
+
return ['JY_GOODS', 'JY_SEND_GOOD', 'JY_LOGISTICS'].includes(item.workOrderComponentType) && !item.notOrderBack;
|
|
1309
|
+
});
|
|
1310
|
+
if (!(jyGoodsComponent !== null && jyGoodsComponent !== void 0 && jyGoodsComponent.length)) return;
|
|
1311
|
+
var tIdCom = (_templateList$compone14 = templateList.componentDtoList) === null || _templateList$compone14 === void 0 ? void 0 : _templateList$compone14.find(function (item) {
|
|
1312
|
+
return item.workOrderComponentType === 'TRADE_ID_INPUT';
|
|
1313
|
+
});
|
|
1314
|
+
var orderNo = tIdCom !== null && tIdCom !== void 0 && tIdCom.uniqueKey ? form.getFieldValue(tIdCom.uniqueKey) : null;
|
|
1315
|
+
var orderInfo = jyOrderTransform({
|
|
1316
|
+
trades: value.selectedRows,
|
|
1317
|
+
componentList: templateList.componentDtoList,
|
|
1318
|
+
orderNo: orderNo,
|
|
1319
|
+
allOrders: value.orders
|
|
1320
|
+
}, form);
|
|
1321
|
+
var values = jyOrderBackFormValues(orderInfo, {
|
|
1322
|
+
componentDtoList: jyGoodsComponent
|
|
1323
|
+
});
|
|
1324
|
+
form.setFieldsValue(values);
|
|
1325
|
+
};
|
|
1229
1326
|
|
|
1230
1327
|
//获取多级下拉最后的值
|
|
1231
1328
|
var getChildValue = function getChildValue() {
|
|
@@ -1386,12 +1483,12 @@ export var transformWorkOrderDetail = function transformWorkOrderDetail(detail)
|
|
|
1386
1483
|
};
|
|
1387
1484
|
|
|
1388
1485
|
// 返填物流轨迹信息
|
|
1389
|
-
export var setLogisticsInfo = function setLogisticsInfo(
|
|
1390
|
-
var logisticsMappingConfig =
|
|
1391
|
-
uniqueKey =
|
|
1392
|
-
workOrderComponentType =
|
|
1393
|
-
value =
|
|
1394
|
-
form =
|
|
1486
|
+
export var setLogisticsInfo = function setLogisticsInfo(_ref14) {
|
|
1487
|
+
var logisticsMappingConfig = _ref14.logisticsMappingConfig,
|
|
1488
|
+
uniqueKey = _ref14.uniqueKey,
|
|
1489
|
+
workOrderComponentType = _ref14.workOrderComponentType,
|
|
1490
|
+
value = _ref14.value,
|
|
1491
|
+
form = _ref14.form;
|
|
1395
1492
|
var values = logisticsMappingConfig.reduce(function (prv, next) {
|
|
1396
1493
|
var logisticsValues = form.getFieldValue(next.uniqueKey);
|
|
1397
1494
|
var componentConfig = next.componentConfig;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { HasFilterHandle } from "./tools";
|
|
2
|
-
import { bsOrderDetail, wlnOrderDetail, wdtOrderDetail, bsE3OrderDetail, kmOrderDetail, gyOrderDetail, skxOrderDetail } from "../../model/servers/api";
|
|
2
|
+
import { bsOrderDetail, wlnOrderDetail, wdtOrderDetail, bsE3OrderDetail, kmOrderDetail, gyOrderDetail, skxOrderDetail, jyOrderDetail, skxReturnOrderDetail } from "../../model/servers/api";
|
|
3
3
|
import { servers } from '@kmkf-fe-packages/kmkf-utils';
|
|
4
4
|
var orderBackKeyListMap = {
|
|
5
5
|
hasJst: ['JST_SYSTEM_ORDER', 'JST_GOODS', 'JST_REISSUE_GOODS', 'JST_LOGISTICS', 'JST_ITEM_SELECT_THIRD', 'JST_SUPPLY', 'JST_SEND_GOOD'],
|
|
@@ -9,7 +9,9 @@ var orderBackKeyListMap = {
|
|
|
9
9
|
hasBsE3: ['BS_E3_SYSTEM_ORDER', 'BS_E3_GOODS', 'BS_E3_REISSUE_GOODS', 'BS_E3_LOGISTICS', 'BS_E3_SEND_GOOD'],
|
|
10
10
|
hasWln: ['WLN_SYSTEM_ORDER', 'WLN_GOODS', 'WLN_LOGISTICS', 'WLN_SEND_GOOD'],
|
|
11
11
|
hasGy: ['GY_SYSTEM_ORDER', 'GY_SEND_GOOD', 'GY_GOODS', 'GY_REISSUE_GOODS', 'GY_RETURN_GOODS', 'GY_LOGISTICS'],
|
|
12
|
-
|
|
12
|
+
hasJy: ['JY_SYSTEM_ORDER', 'JY_SEND_GOOD', 'JY_GOODS', 'JY_REISSUE_GOODS', 'JY_RETURN_GOODS', 'JY_LOGISTICS'],
|
|
13
|
+
hasSkx: ['SKX_OUTBOUND_NOTICE_NO'],
|
|
14
|
+
hasSkxReturn: ['SKX_RETURN_BILL_NO']
|
|
13
15
|
};
|
|
14
16
|
export var orderBackMap = function orderBackMap(_ref) {
|
|
15
17
|
var templateDetail = _ref.templateDetail,
|
|
@@ -76,6 +78,14 @@ export var orderBackMap = function orderBackMap(_ref) {
|
|
|
76
78
|
});
|
|
77
79
|
}
|
|
78
80
|
},
|
|
81
|
+
hasJy: {
|
|
82
|
+
flag: HasFilterHandle(templateDetail, orderBackKeyListMap.hasJy),
|
|
83
|
+
promiseRequest: function promiseRequest() {
|
|
84
|
+
return jyOrderDetail({
|
|
85
|
+
tid: order_no
|
|
86
|
+
});
|
|
87
|
+
}
|
|
88
|
+
},
|
|
79
89
|
// 根据系统订单号反填,所以只要判断是否有系统订单号就行
|
|
80
90
|
hasSkx: {
|
|
81
91
|
flag: HasFilterHandle(templateDetail, orderBackKeyListMap.hasSkx),
|
|
@@ -84,6 +94,15 @@ export var orderBackMap = function orderBackMap(_ref) {
|
|
|
84
94
|
tid: order_no
|
|
85
95
|
});
|
|
86
96
|
}
|
|
97
|
+
},
|
|
98
|
+
// 根据系统订单号反填,所以只要判断是否有系统订单号就行
|
|
99
|
+
hasSkxReturn: {
|
|
100
|
+
flag: HasFilterHandle(templateDetail, orderBackKeyListMap.hasSkxReturn),
|
|
101
|
+
promiseRequest: function promiseRequest() {
|
|
102
|
+
return skxReturnOrderDetail({
|
|
103
|
+
tid: order_no
|
|
104
|
+
});
|
|
105
|
+
}
|
|
87
106
|
}
|
|
88
107
|
};
|
|
89
108
|
};
|