@kmkf-fe-packages/kmkf-work-order-service-component 2.0.19-beta.2 → 2.0.19-beta.3
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.
|
@@ -55,6 +55,7 @@ import { PlatformAvatar } from '@kmkf-fe-packages/services-components';
|
|
|
55
55
|
import { Provide, Context } from "./context";
|
|
56
56
|
import { useSelector } from "./context/useSelector";
|
|
57
57
|
import { pollOperationResult } from "./pollOperationResult";
|
|
58
|
+
import { pushGyLog } from '@kmkf-fe-packages/kmkf-utils';
|
|
58
59
|
var Text = Typography.Text,
|
|
59
60
|
Link = Typography.Link;
|
|
60
61
|
var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
@@ -541,8 +542,10 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
541
542
|
payload: status
|
|
542
543
|
});
|
|
543
544
|
if (status === 'save') {
|
|
545
|
+
pushGyLog('save', form.getFieldsValue());
|
|
544
546
|
handleSave();
|
|
545
547
|
} else if (status === 'submit') {
|
|
548
|
+
pushGyLog('submit', form.getFieldsValue());
|
|
546
549
|
handleSubmitBefore();
|
|
547
550
|
// handleSubmit();
|
|
548
551
|
} else if (status === 'open') {
|
|
@@ -27,6 +27,7 @@ import { PlatForm } from "../../model/flowTemplateDetail/types";
|
|
|
27
27
|
import transformWorkOrderData from "./transformWorkOrderData";
|
|
28
28
|
import submitDataTransOldFormat from "./submitDataTransOldFormat";
|
|
29
29
|
import xzSDK from "./xzSDK";
|
|
30
|
+
import { pushGyLog } from '@kmkf-fe-packages/kmkf-utils';
|
|
30
31
|
import { orderBackMap } from "./tools_constants";
|
|
31
32
|
// 淘宝商品组件信息处理
|
|
32
33
|
|
|
@@ -248,6 +249,7 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
248
249
|
kmOrder: kmOrder,
|
|
249
250
|
gyOrder: gyOrder
|
|
250
251
|
});
|
|
252
|
+
pushGyLog('gyOrder', gyOrder);
|
|
251
253
|
if (data !== null && data !== void 0 && (_data$value = data.value) !== null && _data$value !== void 0 && _data$value.message) {
|
|
252
254
|
message.warning(data === null || data === void 0 ? void 0 : (_data$value2 = data.value) === null || _data$value2 === void 0 ? void 0 : _data$value2.message);
|
|
253
255
|
}
|
|
@@ -266,6 +268,7 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
266
268
|
kmOrders.orderDetailDtoList = filterKmOrders(kmOrders, order_no);
|
|
267
269
|
gyOrders.trades = filterGyOrders(gyOrders, order_no);
|
|
268
270
|
jstOrders.trades = filterJstOrders(jstOrders, order_no);
|
|
271
|
+
pushGyLog('gyOrders', gyOrders);
|
|
269
272
|
Monitor.automaticReport({
|
|
270
273
|
message: "orderBack:\u8BA2\u5355\u53F7:".concat(order_no, ",\u5E97\u94FAid:").concat(shopId, ", \u8BA2\u5355\u4FE1\u606F\uFF1A").concat(JSON.stringify(orderInfo), ",jst\u4FE1\u606F:").concat(JSON.stringify(jstOrders), ",bs\u4FE1\u606F:").concat(JSON.stringify(bsOrders), ",wln\u4FE1\u606F:").concat(JSON.stringify(wlnOrders), ",wdt\u4FE1\u606F:").concat(JSON.stringify(wdtOrders), ",\n bsE3\u4FE1\u606F:").concat(JSON.stringify(bsE3Orders), ", km\u4FE1\u606F:").concat(JSON.stringify(kmOrders), ",\u7BA1\u6613\u4FE1\u606F:").concat(JSON.stringify(gyOrders))
|
|
271
274
|
});
|
|
@@ -292,6 +295,7 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
292
295
|
componentList: templateDetail.componentDtoList,
|
|
293
296
|
orderNo: order_no
|
|
294
297
|
}), form);
|
|
298
|
+
pushGyLog('gyInfo', gyInfo);
|
|
295
299
|
jstInfo = jstOrderTransform(_objectSpread(_objectSpread({}, jstOrders), {}, {
|
|
296
300
|
componentList: templateDetail.componentDtoList,
|
|
297
301
|
orderNo: order_no
|
|
@@ -360,6 +364,7 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
360
364
|
sendId: '',
|
|
361
365
|
sendName: ''
|
|
362
366
|
}];
|
|
367
|
+
pushGyLog('gyInfo_after', gyInfo);
|
|
363
368
|
}
|
|
364
369
|
if ((kmOrders === null || kmOrders === void 0 ? void 0 : (_kmOrders$orderDetail = kmOrders.orderDetailDtoList) === null || _kmOrders$orderDetail === void 0 ? void 0 : _kmOrders$orderDetail.length) > 1) {
|
|
365
370
|
kmInfo.kmSendGood = [{
|
|
@@ -396,7 +401,9 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
396
401
|
bsE3Order: bsE3Info,
|
|
397
402
|
kmOrder: kmInfo,
|
|
398
403
|
gyOrder: gyInfo
|
|
399
|
-
});
|
|
404
|
+
});
|
|
405
|
+
pushGyLog('detail', detail);
|
|
406
|
+
//抖音数据特殊处理
|
|
400
407
|
if (shopSourceStr === 'FXG') {
|
|
401
408
|
detail = updateDYDetails(detail);
|
|
402
409
|
} else if (shopSourceStr === 'SPH' || shopSourceStr === 'WXXD') {
|
|
@@ -406,7 +413,7 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
406
413
|
hasSelectItem = HasErpItemSelectHandle(templateDetail);
|
|
407
414
|
erpPromiseList = [];
|
|
408
415
|
if (!(shopSourceStr === 'TAOBAO' && hasSelectItem)) {
|
|
409
|
-
_context.next =
|
|
416
|
+
_context.next = 89;
|
|
410
417
|
break;
|
|
411
418
|
}
|
|
412
419
|
list = detail['itemList'];
|
|
@@ -424,10 +431,10 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
424
431
|
resolve({});
|
|
425
432
|
});
|
|
426
433
|
});
|
|
427
|
-
_context.prev =
|
|
428
|
-
_context.next =
|
|
434
|
+
_context.prev = 79;
|
|
435
|
+
_context.next = 82;
|
|
429
436
|
return Promise.all(promises);
|
|
430
|
-
case
|
|
437
|
+
case 82:
|
|
431
438
|
erpPromiseList = _context.sent;
|
|
432
439
|
detail['itemList'] = (_detail$itemList = detail['itemList']) === null || _detail$itemList === void 0 ? void 0 : _detail$itemList.map(function (item, index) {
|
|
433
440
|
return _objectSpread(_objectSpread({}, item), {}, {
|
|
@@ -437,13 +444,13 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
437
444
|
})
|
|
438
445
|
});
|
|
439
446
|
});
|
|
440
|
-
_context.next =
|
|
447
|
+
_context.next = 89;
|
|
441
448
|
break;
|
|
442
|
-
case
|
|
443
|
-
_context.prev =
|
|
444
|
-
_context.t1 = _context["catch"](
|
|
449
|
+
case 86:
|
|
450
|
+
_context.prev = 86;
|
|
451
|
+
_context.t1 = _context["catch"](79);
|
|
445
452
|
console.error('调用erp获取宝贝编码错误', _context.t1);
|
|
446
|
-
case
|
|
453
|
+
case 89:
|
|
447
454
|
// console.log('detail', detail);
|
|
448
455
|
values = orderBackFormValues({
|
|
449
456
|
detail: detail,
|
|
@@ -453,6 +460,7 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
453
460
|
type: type,
|
|
454
461
|
fromQNCreateWorkOrderByOrderNo: fromQNCreateWorkOrderByOrderNo
|
|
455
462
|
});
|
|
463
|
+
pushGyLog('values', values);
|
|
456
464
|
console.log('formValue', formValue);
|
|
457
465
|
console.log('values', values, {
|
|
458
466
|
type: type,
|
|
@@ -485,18 +493,22 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
485
493
|
fixed_field_buyerOpenUid: orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.buyerOpenUid,
|
|
486
494
|
shopId: shopId
|
|
487
495
|
}));
|
|
496
|
+
pushGyLog('setFieldsValue', _objectSpread(_objectSpread(_objectSpread({}, formValue), values), {}, {
|
|
497
|
+
fixed_field_buyerOpenUid: orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.buyerOpenUid,
|
|
498
|
+
shopId: shopId
|
|
499
|
+
}));
|
|
488
500
|
callback === null || callback === void 0 ? void 0 : callback(detail, templateDetail);
|
|
489
|
-
_context.next =
|
|
501
|
+
_context.next = 102;
|
|
490
502
|
break;
|
|
491
|
-
case
|
|
492
|
-
_context.prev =
|
|
503
|
+
case 99:
|
|
504
|
+
_context.prev = 99;
|
|
493
505
|
_context.t2 = _context["catch"](18);
|
|
494
506
|
console.error(_context.t2);
|
|
495
|
-
case
|
|
507
|
+
case 102:
|
|
496
508
|
case "end":
|
|
497
509
|
return _context.stop();
|
|
498
510
|
}
|
|
499
|
-
}, _callee, null, [[3, 10], [18,
|
|
511
|
+
}, _callee, null, [[3, 10], [18, 99], [79, 86]]);
|
|
500
512
|
}));
|
|
501
513
|
return function orderBack(_x) {
|
|
502
514
|
return _ref2.apply(this, arguments);
|
|
@@ -33,13 +33,14 @@ var processRadio = function processRadio(getValue) {
|
|
|
33
33
|
};
|
|
34
34
|
var processInput = function processInput(getValue) {
|
|
35
35
|
return function (nex, config) {
|
|
36
|
-
|
|
36
|
+
var _getValue;
|
|
37
|
+
return _defineProperty({}, nex.uniqueKey, (_getValue = getValue("".concat(nex.uniqueKey, "_input"))) !== null && _getValue !== void 0 ? _getValue : config === null || config === void 0 ? void 0 : config.input);
|
|
37
38
|
};
|
|
38
39
|
};
|
|
39
40
|
var processNumericalCalculation = function processNumericalCalculation(getValue) {
|
|
40
41
|
return function (nex, config) {
|
|
41
|
-
var
|
|
42
|
-
return _defineProperty({}, nex.uniqueKey, (
|
|
42
|
+
var _getValue2;
|
|
43
|
+
return _defineProperty({}, nex.uniqueKey, (_getValue2 = getValue("".concat(nex.uniqueKey, "_numericalCalculation"))) !== null && _getValue2 !== void 0 ? _getValue2 : config === null || config === void 0 ? void 0 : config.numericalCalculation);
|
|
43
44
|
};
|
|
44
45
|
};
|
|
45
46
|
var processTextarea = function processTextarea(getValue) {
|
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.19-beta.
|
|
3
|
+
"version": "2.0.19-beta.3",
|
|
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.19-beta.
|
|
36
|
-
"@kmkf-fe-packages/kmkf-utils": "2.0.19-beta.
|
|
37
|
-
"@kmkf-fe-packages/services-components": "2.0.19-beta.
|
|
35
|
+
"@kmkf-fe-packages/basic-components": "2.0.19-beta.3",
|
|
36
|
+
"@kmkf-fe-packages/kmkf-utils": "2.0.19-beta.3",
|
|
37
|
+
"@kmkf-fe-packages/services-components": "2.0.19-beta.3",
|
|
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": "955adf4b04a4f127fb61b5640b4b1196dec5f608",
|
|
77
77
|
"gitHooks": {
|
|
78
78
|
"pre-commit": "lint-staged"
|
|
79
79
|
}
|