@kmkf-fe-packages/kmkf-work-order-service-component 2.8.0-rc.0 → 2.9.0-rc.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 +295 -228
- package/dist/esm/FlowTemplateDetailV2/components/FormRender/onBlur.d.ts +6 -0
- package/dist/esm/FlowTemplateDetailV2/components/FormRender/onBlur.js +64 -0
- package/dist/esm/FlowTemplateDetailV2/index.js +32 -22
- package/dist/esm/FlowTemplateDetailV2/store/reducers.d.ts +2 -0
- package/dist/esm/FlowTemplateDetailV2/store/reducers.js +9 -2
- package/dist/esm/FlowTemplateDetailV2/store/selector.d.ts +1 -0
- package/dist/esm/FlowTemplateDetailV2/store/selector.js +3 -0
- package/dist/esm/common/utils/tools.js +18 -10
- package/dist/esm/model/flowTemplateDetail/types.d.ts +1 -0
- package/package.json +5 -5
|
@@ -43,7 +43,7 @@ import { jsonParseSecurity, findComponentUniqueKeyByType } from "../../../common
|
|
|
43
43
|
import { NEED_CLEAR_FIELDS_WHEN_SHOP_ID_CHANGE } from "../../constant";
|
|
44
44
|
import { Context } from "../../context";
|
|
45
45
|
import { orderBackKmAddress } from "./constants";
|
|
46
|
-
import { onBlurExpressLogisticsCode, onBlurErpAfterSaleTradeId, onBlurSkxOutboundNoticeNo, onBlurSkxReturnBillNo } from "./onBlur";
|
|
46
|
+
import { onBlurExpressLogisticsCode, onBlurErpAfterSaleTradeId, onBlurSkxOutboundNoticeNo, onBlurSkxReturnBillNo, onBlurSkxLogisticsCode } from "./onBlur";
|
|
47
47
|
import { findAllDependencies } from "./component-dependency-finder";
|
|
48
48
|
import { findValueDependencies } from "./value-mapping-finder";
|
|
49
49
|
// 记录显隐触发隐藏的组件。显示后，重新出发一遍映射规则
|
|
@@ -378,160 +378,215 @@ var FormRender = function FormRender(props, ref) {
|
|
|
378
378
|
setLabelList(jsonParseSecurity(record === null || record === void 0 ? void 0 : (_record$jsonMap = record.jsonMap) === null || _record$jsonMap === void 0 ? void 0 : _record$jsonMap["".concat(labelComponent === null || labelComponent === void 0 ? void 0 : labelComponent.uniqueKey, "_label")], []));
|
|
379
379
|
}
|
|
380
380
|
}, [labelComponent, record]);
|
|
381
|
-
var queryDetail = function
|
|
382
|
-
var
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
|
|
399
|
-
|
|
400
|
-
|
|
401
|
-
|
|
402
|
-
|
|
403
|
-
|
|
404
|
-
|
|
405
|
-
|
|
406
|
-
|
|
407
|
-
|
|
408
|
-
|
|
409
|
-
|
|
410
|
-
|
|
411
|
-
|
|
412
|
-
|
|
413
|
-
|
|
414
|
-
|
|
415
|
-
|
|
416
|
-
|
|
417
|
-
|
|
418
|
-
|
|
419
|
-
|
|
420
|
-
|
|
421
|
-
|
|
422
|
-
|
|
423
|
-
|
|
424
|
-
|
|
425
|
-
|
|
426
|
-
|
|
427
|
-
|
|
428
|
-
|
|
429
|
-
|
|
430
|
-
|
|
431
|
-
shopId: shopId,
|
|
432
|
-
shopName: newRecord.shopName,
|
|
433
|
-
submitter: newRecord.submitter,
|
|
434
|
-
created: newRecord.created,
|
|
435
|
-
processTime: newRecord.processTime
|
|
436
|
-
}));
|
|
437
|
-
var initialValues = get(transData, '0', {});
|
|
438
|
-
newRecord.preCreateAndNotModified && batchFillByMapping(initialValues);
|
|
439
|
-
orderBackReplace(transData, templateDetail);
|
|
440
|
-
// TODO: 非开始节点录入，都会有workOrderId,这里判断是否有前置组件含有订单号；如果存在订单号，进行订单反填。
|
|
441
|
-
var tradeIdUniqueKey = findComponentUniqueKeyByType(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList, 'TRADE_ID_INPUT');
|
|
442
|
-
if (tradeIdUniqueKey && shopId && record !== null && record !== void 0 && (_record$jsonMap2 = record.jsonMap) !== null && _record$jsonMap2 !== void 0 && _record$jsonMap2["".concat(tradeIdUniqueKey, "_tradeId")] && firstOrderBackfill) {
|
|
443
|
-
var _record$jsonMap3, _record$jsonMap4, _record$jsonMap5;
|
|
444
|
-
orderBack({
|
|
445
|
-
order_no: record === null || record === void 0 ? void 0 : (_record$jsonMap3 = record.jsonMap) === null || _record$jsonMap3 === void 0 ? void 0 : _record$jsonMap3["".concat(tradeIdUniqueKey, "_tradeId")],
|
|
446
|
-
form: form,
|
|
447
|
-
shopId: shopId,
|
|
448
|
-
shopList: shopList,
|
|
449
|
-
templateDetail: templateDetail,
|
|
450
|
-
callback: orderBackReplace,
|
|
451
|
-
fromQNCreateWorkOrderByOrderNo: fromQNCreateWorkOrderByOrderNo,
|
|
452
|
-
plat: plat,
|
|
453
|
-
callKey: 1,
|
|
454
|
-
setLoading: setLoading
|
|
455
|
-
});
|
|
456
|
-
queryLabels(record === null || record === void 0 ? void 0 : (_record$jsonMap4 = record.jsonMap) === null || _record$jsonMap4 === void 0 ? void 0 : _record$jsonMap4["".concat(tradeIdUniqueKey, "_tradeId")], shopId);
|
|
457
|
-
queryMemberLevels(record === null || record === void 0 ? void 0 : (_record$jsonMap5 = record.jsonMap) === null || _record$jsonMap5 === void 0 ? void 0 : _record$jsonMap5["".concat(tradeIdUniqueKey, "_tradeId")], shopId);
|
|
458
|
-
} else {
|
|
459
|
-
// 如果没有订单反填，则单独更新remark
|
|
460
|
-
fetchRemark(shopId, currentNodeTid);
|
|
461
|
-
}
|
|
462
|
-
} else {
|
|
463
|
-
fillByShopId(shopId);
|
|
464
|
-
var initFormValues = null;
|
|
465
|
-
if (plat !== null && plat !== void 0 && plat.subOrderNo) {
|
|
466
|
-
var _getCacheInfo = JSON.parse(sessionStorage.getItem('cacheOmsOrderInfo') || '{}');
|
|
467
|
-
if (plat !== null && plat !== void 0 && plat.subOrderNo && plat.buyerId) {
|
|
468
|
-
var _getCacheInfo2;
|
|
469
|
-
initFormValues = (_getCacheInfo2 = _getCacheInfo["".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId)]) === null || _getCacheInfo2 === void 0 ? void 0 : _getCacheInfo2[plat === null || plat === void 0 ? void 0 : plat.subOrderNo];
|
|
470
|
-
}
|
|
471
|
-
} else {
|
|
472
|
-
var _getCacheInfo3 = JSON.parse(sessionStorage.getItem('cacheOrderInfo') || '{}');
|
|
473
|
-
if (orderNo && plat.buyerId) {
|
|
474
|
-
var _getCacheInfo4;
|
|
475
|
-
initFormValues = (_getCacheInfo4 = _getCacheInfo3["".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId)]) === null || _getCacheInfo4 === void 0 ? void 0 : _getCacheInfo4[orderNo];
|
|
476
|
-
} else if (!orderNo && plat.buyerId) {
|
|
477
|
-
initFormValues = Object.values(_getCacheInfo3["".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId)] || {})[0];
|
|
478
|
-
}
|
|
479
|
-
}
|
|
381
|
+
var queryDetail = /*#__PURE__*/function () {
|
|
382
|
+
var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref2) {
|
|
383
|
+
var workOrderId, shopId, shopList, record, orderNo, buyerId, buyerNick, jsonMap, _record$jsonMap5, newRecord, jsonMapOrderId, getCacheInfo, newFormValues, transData, initialValues, tradeIdUniqueKey, _record$jsonMap2, _record$jsonMap3, _record$jsonMap4, _tradeIdUniqueKey, _record$jsonMap6, _record$jsonMap7, _record$jsonMap8, initFormValues, _getCacheInfo, _getCacheInfo2, _getCacheInfo3, _getCacheInfo4, _orderNo, _shopId, orderNoField, _transData, _initialValues, antFormEl;
|
|
384
|
+
return _regeneratorRuntime().wrap(function _callee2$(_context2) {
|
|
385
|
+
while (1) switch (_context2.prev = _context2.next) {
|
|
386
|
+
case 0:
|
|
387
|
+
workOrderId = _ref2.workOrderId, shopId = _ref2.shopId, shopList = _ref2.shopList, record = _ref2.record, orderNo = _ref2.orderNo, buyerId = _ref2.buyerId, buyerNick = _ref2.buyerNick;
|
|
388
|
+
if (!isOrderBackShopId) {
|
|
389
|
+
_context2.next = 4;
|
|
390
|
+
break;
|
|
391
|
+
}
|
|
392
|
+
setIsOrderBackShopId(false);
|
|
393
|
+
return _context2.abrupt("return");
|
|
394
|
+
case 4:
|
|
395
|
+
form.resetFields();
|
|
396
|
+
//获取一些默认数据
|
|
397
|
+
jsonMap = templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList.reduce(function (prv, next) {
|
|
398
|
+
if (next.workOrderComponentType === 'TRADE_ID_INPUT') {
|
|
399
|
+
prv["".concat(next.uniqueKey, "_tradeId")] = orderNo;
|
|
400
|
+
}
|
|
401
|
+
if (next.workOrderComponentType === 'BUYER_NICK_INPUT') {
|
|
402
|
+
prv["".concat(next.uniqueKey, "_buyerOpenUid")] = buyerId;
|
|
403
|
+
prv["".concat(next.uniqueKey, "_buyerNick")] = buyerNick;
|
|
404
|
+
}
|
|
405
|
+
if (next.workOrderComponentType === 'ENTERPRISE_PAYMENT') {
|
|
406
|
+
prv["".concat(next.uniqueKey, "_enterprisePaymentTid")] = orderNo || '';
|
|
407
|
+
prv["".concat(next.uniqueKey, "_enterprisePaymentBuyerOpenUid")] = buyerId;
|
|
408
|
+
prv["".concat(next.uniqueKey, "_enterprisePaymentBuyerNick")] = buyerNick;
|
|
409
|
+
}
|
|
410
|
+
return prv;
|
|
411
|
+
}, {});
|
|
412
|
+
if (!workOrderId) {
|
|
413
|
+
_context2.next = 37;
|
|
414
|
+
break;
|
|
415
|
+
}
|
|
416
|
+
// 先初始化端上内容
|
|
417
|
+
newRecord = cloneDeep(record);
|
|
418
|
+
jsonMapOrderId = Object.keys(newRecord.jsonMap).reduce(function (prv, next) {
|
|
419
|
+
var arrText = next.split('_');
|
|
420
|
+
if (arrText[arrText.length - 1] === 'tradeId') {
|
|
421
|
+
prv = newRecord.jsonMap[next];
|
|
422
|
+
}
|
|
423
|
+
return prv;
|
|
424
|
+
}, ''); //获取保存时的订单缓存数据，解决用户显隐组件不展示二次编辑没有订单信息的问题
|
|
425
|
+
getCacheInfo = JSON.parse(sessionStorage.getItem('cacheOrderInfo') || '{}');
|
|
426
|
+
newFormValues = _objectSpread({}, getCacheInfo[jsonMapOrderId] || {});
|
|
427
|
+
newFormValues = reversalFormValues(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, newFormValues);
|
|
428
|
+
newRecord.jsonMap = _objectSpread(_objectSpread(_objectSpread({}, newFormValues), jsonMap), newRecord.jsonMap);
|
|
429
|
+
transData = calcWorkOrderList([newRecord], [].concat(_toConsumableArray((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList) || []), _toConsumableArray((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || [])), newRecord.preCreateAndNotModified ? 'init' : 'edit' // TODO: 修复非首节点录入时丢失初始值问题
|
|
430
|
+
); // console.log(newRecord.jsonMap, newFormValues, transData);
|
|
480
431
|
|
|
481
|
-
|
|
482
|
-
|
|
483
|
-
|
|
484
|
-
|
|
485
|
-
|
|
486
|
-
|
|
487
|
-
|
|
488
|
-
|
|
489
|
-
|
|
490
|
-
|
|
491
|
-
|
|
492
|
-
|
|
493
|
-
|
|
494
|
-
|
|
495
|
-
|
|
496
|
-
|
|
497
|
-
|
|
498
|
-
|
|
499
|
-
|
|
500
|
-
|
|
501
|
-
|
|
502
|
-
|
|
503
|
-
|
|
504
|
-
|
|
505
|
-
|
|
506
|
-
|
|
507
|
-
|
|
432
|
+
form.setFieldsValue(_objectSpread(_objectSpread({}, get(transData, '0', {})), {}, {
|
|
433
|
+
shopId: shopId,
|
|
434
|
+
shopName: newRecord.shopName,
|
|
435
|
+
submitter: newRecord.submitter,
|
|
436
|
+
created: newRecord.created,
|
|
437
|
+
processTime: newRecord.processTime
|
|
438
|
+
}));
|
|
439
|
+
initialValues = get(transData, '0', {});
|
|
440
|
+
newRecord.preCreateAndNotModified && batchFillByMapping(initialValues);
|
|
441
|
+
orderBackReplace(transData, templateDetail);
|
|
442
|
+
// TODO: 非开始节点录入，都会有workOrderId,这里判断是否有前置组件含有订单号；如果存在订单号，进行订单反填。
|
|
443
|
+
tradeIdUniqueKey = findComponentUniqueKeyByType(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList, 'TRADE_ID_INPUT');
|
|
444
|
+
if (!newRecord.notAutoFillWithFirstSubmit) {
|
|
445
|
+
_context2.next = 27;
|
|
446
|
+
break;
|
|
447
|
+
}
|
|
448
|
+
_tradeIdUniqueKey = findComponentUniqueKeyByType(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, 'TRADE_ID_INPUT');
|
|
449
|
+
queryLabels(record === null || record === void 0 ? void 0 : (_record$jsonMap2 = record.jsonMap) === null || _record$jsonMap2 === void 0 ? void 0 : _record$jsonMap2["".concat(_tradeIdUniqueKey, "_tradeId")], shopId);
|
|
450
|
+
queryMemberLevels(record === null || record === void 0 ? void 0 : (_record$jsonMap3 = record.jsonMap) === null || _record$jsonMap3 === void 0 ? void 0 : _record$jsonMap3["".concat(_tradeIdUniqueKey, "_tradeId")], shopId);
|
|
451
|
+
_context2.next = 25;
|
|
452
|
+
return orderBack({
|
|
453
|
+
order_no: record === null || record === void 0 ? void 0 : (_record$jsonMap4 = record.jsonMap) === null || _record$jsonMap4 === void 0 ? void 0 : _record$jsonMap4["".concat(_tradeIdUniqueKey, "_tradeId")],
|
|
454
|
+
form: form,
|
|
455
|
+
shopId: shopId,
|
|
456
|
+
shopList: shopList,
|
|
457
|
+
templateDetail: templateDetail,
|
|
458
|
+
callback: orderBackReplace,
|
|
459
|
+
fromQNCreateWorkOrderByOrderNo: fromQNCreateWorkOrderByOrderNo,
|
|
460
|
+
plat: plat,
|
|
461
|
+
callKey: 1,
|
|
462
|
+
setLoading: setLoading
|
|
463
|
+
});
|
|
464
|
+
case 25:
|
|
465
|
+
_context2.next = 35;
|
|
466
|
+
break;
|
|
467
|
+
case 27:
|
|
468
|
+
if (!(tradeIdUniqueKey && shopId && record !== null && record !== void 0 && (_record$jsonMap5 = record.jsonMap) !== null && _record$jsonMap5 !== void 0 && _record$jsonMap5["".concat(tradeIdUniqueKey, "_tradeId")] && firstOrderBackfill)) {
|
|
469
|
+
_context2.next = 34;
|
|
470
|
+
break;
|
|
471
|
+
}
|
|
472
|
+
queryLabels(record === null || record === void 0 ? void 0 : (_record$jsonMap6 = record.jsonMap) === null || _record$jsonMap6 === void 0 ? void 0 : _record$jsonMap6["".concat(tradeIdUniqueKey, "_tradeId")], shopId);
|
|
473
|
+
queryMemberLevels(record === null || record === void 0 ? void 0 : (_record$jsonMap7 = record.jsonMap) === null || _record$jsonMap7 === void 0 ? void 0 : _record$jsonMap7["".concat(tradeIdUniqueKey, "_tradeId")], shopId);
|
|
474
|
+
_context2.next = 32;
|
|
475
|
+
return orderBack({
|
|
476
|
+
order_no: record === null || record === void 0 ? void 0 : (_record$jsonMap8 = record.jsonMap) === null || _record$jsonMap8 === void 0 ? void 0 : _record$jsonMap8["".concat(tradeIdUniqueKey, "_tradeId")],
|
|
477
|
+
form: form,
|
|
478
|
+
shopId: shopId,
|
|
479
|
+
shopList: shopList,
|
|
480
|
+
templateDetail: templateDetail,
|
|
481
|
+
callback: orderBackReplace,
|
|
482
|
+
fromQNCreateWorkOrderByOrderNo: fromQNCreateWorkOrderByOrderNo,
|
|
483
|
+
plat: plat,
|
|
484
|
+
callKey: 1,
|
|
485
|
+
setLoading: setLoading
|
|
486
|
+
});
|
|
487
|
+
case 32:
|
|
488
|
+
_context2.next = 35;
|
|
489
|
+
break;
|
|
490
|
+
case 34:
|
|
491
|
+
// 如果没有订单反填，则单独更新remark
|
|
492
|
+
fetchRemark(shopId, currentNodeTid);
|
|
493
|
+
case 35:
|
|
494
|
+
_context2.next = 60;
|
|
495
|
+
break;
|
|
496
|
+
case 37:
|
|
497
|
+
fillByShopId(shopId);
|
|
498
|
+
initFormValues = null;
|
|
499
|
+
if (plat !== null && plat !== void 0 && plat.subOrderNo) {
|
|
500
|
+
_getCacheInfo = JSON.parse(sessionStorage.getItem('cacheOmsOrderInfo') || '{}');
|
|
501
|
+
if (plat !== null && plat !== void 0 && plat.subOrderNo && plat.buyerId) {
|
|
502
|
+
initFormValues = (_getCacheInfo2 = _getCacheInfo["".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId)]) === null || _getCacheInfo2 === void 0 ? void 0 : _getCacheInfo2[plat === null || plat === void 0 ? void 0 : plat.subOrderNo];
|
|
503
|
+
}
|
|
504
|
+
} else {
|
|
505
|
+
_getCacheInfo3 = JSON.parse(sessionStorage.getItem('cacheOrderInfo') || '{}');
|
|
506
|
+
if (orderNo && plat.buyerId) {
|
|
507
|
+
initFormValues = (_getCacheInfo4 = _getCacheInfo3["".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId)]) === null || _getCacheInfo4 === void 0 ? void 0 : _getCacheInfo4[orderNo];
|
|
508
|
+
} else if (!orderNo && plat.buyerId) {
|
|
509
|
+
initFormValues = Object.values(_getCacheInfo3["".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId)] || {})[0];
|
|
510
|
+
}
|
|
511
|
+
}
|
|
508
512
|
|
|
509
|
-
|
|
510
|
-
|
|
511
|
-
|
|
512
|
-
|
|
513
|
-
|
|
514
|
-
|
|
515
|
-
|
|
516
|
-
|
|
517
|
-
|
|
518
|
-
//
|
|
519
|
-
|
|
520
|
-
|
|
521
|
-
|
|
522
|
-
|
|
523
|
-
|
|
524
|
-
|
|
525
|
-
|
|
526
|
-
|
|
527
|
-
|
|
513
|
+
// console.log(orderNo, initFormValues);
|
|
514
|
+
if (!initFormValues) {
|
|
515
|
+
_context2.next = 48;
|
|
516
|
+
break;
|
|
517
|
+
}
|
|
518
|
+
form.setFieldsValue(_objectSpread(_objectSpread({}, initFormValues), {}, {
|
|
519
|
+
shopId: shopId
|
|
520
|
+
}));
|
|
521
|
+
// 没有触发订单反填的情况下，更新备注,
|
|
522
|
+
// PS: orderNo 和 shopId 可能需要从initFormValues中获取
|
|
523
|
+
_orderNo = orderNo;
|
|
524
|
+
_shopId = shopId || initFormValues['shopId'];
|
|
525
|
+
if (!_orderNo) {
|
|
526
|
+
orderNoField = ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).find(function (item) {
|
|
527
|
+
return (item === null || item === void 0 ? void 0 : item.workOrderComponentType) === 'TRADE_ID_INPUT';
|
|
528
|
+
});
|
|
529
|
+
_orderNo = orderNoField !== null && orderNoField !== void 0 && orderNoField.uniqueKey ? initFormValues[orderNoField === null || orderNoField === void 0 ? void 0 : orderNoField.uniqueKey] || _orderNo : _orderNo;
|
|
530
|
+
}
|
|
531
|
+
fetchRemark(_shopId, _orderNo);
|
|
532
|
+
_context2.next = 60;
|
|
533
|
+
break;
|
|
534
|
+
case 48:
|
|
535
|
+
_transData = calcWorkOrderList([{
|
|
536
|
+
jsonMap: jsonMap
|
|
537
|
+
}], [].concat(_toConsumableArray((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList) || []), _toConsumableArray((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || [])), 'init');
|
|
538
|
+
_initialValues = get(_transData, '0', {});
|
|
539
|
+
form.setFieldsValue(_objectSpread(_objectSpread({}, _initialValues), {}, {
|
|
540
|
+
shopId: shopId
|
|
541
|
+
}));
|
|
542
|
+
// 默认值触发映射
|
|
543
|
+
batchFillByMapping(_initialValues);
|
|
544
|
+
//如果有订单号 订单返填 通过订单号入口进行工单录入，需要将订单数据反填到工单
|
|
545
|
+
if (!(orderNo && shopId)) {
|
|
546
|
+
_context2.next = 59;
|
|
547
|
+
break;
|
|
548
|
+
}
|
|
549
|
+
queryLabels(orderNo, shopId);
|
|
550
|
+
queryMemberLevels(orderNo, shopId);
|
|
551
|
+
_context2.next = 57;
|
|
552
|
+
return orderBack({
|
|
553
|
+
order_no: orderNo,
|
|
554
|
+
form: form,
|
|
555
|
+
shopId: shopId,
|
|
556
|
+
shopList: shopList,
|
|
557
|
+
templateDetail: templateDetail,
|
|
558
|
+
callback: orderBackReplace,
|
|
559
|
+
fromQNCreateWorkOrderByOrderNo: fromQNCreateWorkOrderByOrderNo,
|
|
560
|
+
// TODO: 只有在千牛端通过订单号录入工单的时候，订单备注不需要反填
|
|
561
|
+
plat: plat,
|
|
562
|
+
callKey: 2,
|
|
563
|
+
setLoading: setLoading
|
|
564
|
+
});
|
|
565
|
+
case 57:
|
|
566
|
+
_context2.next = 60;
|
|
567
|
+
break;
|
|
568
|
+
case 59:
|
|
569
|
+
// 如果没有订单反填，则单独更新remark
|
|
570
|
+
fetchRemark(shopId, currentNodeTid);
|
|
571
|
+
case 60:
|
|
572
|
+
antFormEl = document.getElementsByClassName('ant-form');
|
|
573
|
+
(antFormEl === null || antFormEl === void 0 ? void 0 : antFormEl.length) > 0 && set(antFormEl, '0.scrollTop', 0);
|
|
574
|
+
resetMappingHideComponents();
|
|
575
|
+
// TODO: 临时方案，解决批量提交时未带入订单反填数据
|
|
576
|
+
dispatch({
|
|
577
|
+
type: 'setaAutoSubmitFlag',
|
|
578
|
+
payload: true
|
|
579
|
+
});
|
|
580
|
+
case 64:
|
|
581
|
+
case "end":
|
|
582
|
+
return _context2.stop();
|
|
528
583
|
}
|
|
529
|
-
}
|
|
530
|
-
}
|
|
531
|
-
|
|
532
|
-
|
|
533
|
-
|
|
534
|
-
};
|
|
584
|
+
}, _callee2);
|
|
585
|
+
}));
|
|
586
|
+
return function queryDetail(_x4) {
|
|
587
|
+
return _ref3.apply(this, arguments);
|
|
588
|
+
};
|
|
589
|
+
}();
|
|
535
590
|
useEffect(function () {
|
|
536
591
|
if (isErpUse) return;
|
|
537
592
|
queryDetail({
|
|
@@ -631,26 +686,26 @@ var FormRender = function FormRender(props, ref) {
|
|
|
631
686
|
|
|
632
687
|
// 查询标签
|
|
633
688
|
var queryLabels = /*#__PURE__*/function () {
|
|
634
|
-
var
|
|
689
|
+
var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(tid, shopId) {
|
|
635
690
|
var oldLabelList, _yield$queryLabelByTr, _yield$queryLabelByTr2, data;
|
|
636
|
-
return _regeneratorRuntime().wrap(function
|
|
637
|
-
while (1) switch (
|
|
691
|
+
return _regeneratorRuntime().wrap(function _callee3$(_context3) {
|
|
692
|
+
while (1) switch (_context3.prev = _context3.next) {
|
|
638
693
|
case 0:
|
|
639
694
|
if (!isNull(labelComponent)) {
|
|
640
|
-
|
|
695
|
+
_context3.next = 2;
|
|
641
696
|
break;
|
|
642
697
|
}
|
|
643
|
-
return
|
|
698
|
+
return _context3.abrupt("return", console.debug('当前节点不需要查询标签'));
|
|
644
699
|
case 2:
|
|
645
700
|
if (shopId) {
|
|
646
|
-
|
|
701
|
+
_context3.next = 4;
|
|
647
702
|
break;
|
|
648
703
|
}
|
|
649
|
-
return
|
|
704
|
+
return _context3.abrupt("return", console.debug('查询标签缺少必要参数-shopId'));
|
|
650
705
|
case 4:
|
|
651
706
|
oldLabelList = form.getFieldValue("".concat(labelComponent.uniqueKey));
|
|
652
707
|
if (tid) {
|
|
653
|
-
|
|
708
|
+
_context3.next = 9;
|
|
654
709
|
break;
|
|
655
710
|
}
|
|
656
711
|
setLabelList(function (list) {
|
|
@@ -660,15 +715,15 @@ var FormRender = function FormRender(props, ref) {
|
|
|
660
715
|
if (oldLabelList.length !== 0) {
|
|
661
716
|
form.setFieldsValue(_defineProperty({}, "".concat(labelComponent.uniqueKey), []));
|
|
662
717
|
}
|
|
663
|
-
return
|
|
718
|
+
return _context3.abrupt("return", console.debug('查询标签缺少必要参数-tradeId'));
|
|
664
719
|
case 9:
|
|
665
|
-
|
|
720
|
+
_context3.next = 11;
|
|
666
721
|
return queryLabelByTradeId({
|
|
667
722
|
tid: tid,
|
|
668
723
|
shopId: shopId
|
|
669
724
|
});
|
|
670
725
|
case 11:
|
|
671
|
-
_yield$queryLabelByTr =
|
|
726
|
+
_yield$queryLabelByTr = _context3.sent;
|
|
672
727
|
_yield$queryLabelByTr2 = _yield$queryLabelByTr.data;
|
|
673
728
|
data = _yield$queryLabelByTr2 === void 0 ? [] : _yield$queryLabelByTr2;
|
|
674
729
|
setLabelList(function (list) {
|
|
@@ -680,50 +735,50 @@ var FormRender = function FormRender(props, ref) {
|
|
|
680
735
|
}
|
|
681
736
|
case 16:
|
|
682
737
|
case "end":
|
|
683
|
-
return
|
|
738
|
+
return _context3.stop();
|
|
684
739
|
}
|
|
685
|
-
},
|
|
740
|
+
}, _callee3);
|
|
686
741
|
}));
|
|
687
|
-
return function queryLabels(
|
|
688
|
-
return
|
|
742
|
+
return function queryLabels(_x5, _x6) {
|
|
743
|
+
return _ref4.apply(this, arguments);
|
|
689
744
|
};
|
|
690
745
|
}();
|
|
691
746
|
// 查询会员等级
|
|
692
747
|
var queryMemberLevels = /*#__PURE__*/function () {
|
|
693
|
-
var
|
|
748
|
+
var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(tid, shopId) {
|
|
694
749
|
var oldMemberLevel, _yield$queryMemberLev, _yield$queryMemberLev2, data;
|
|
695
|
-
return _regeneratorRuntime().wrap(function
|
|
696
|
-
while (1) switch (
|
|
750
|
+
return _regeneratorRuntime().wrap(function _callee4$(_context4) {
|
|
751
|
+
while (1) switch (_context4.prev = _context4.next) {
|
|
697
752
|
case 0:
|
|
698
753
|
if (!isNull(memberLevelComponent)) {
|
|
699
|
-
|
|
754
|
+
_context4.next = 2;
|
|
700
755
|
break;
|
|
701
756
|
}
|
|
702
|
-
return
|
|
757
|
+
return _context4.abrupt("return", console.debug('当前节点不需要查询会员等级'));
|
|
703
758
|
case 2:
|
|
704
759
|
if (shopId) {
|
|
705
|
-
|
|
760
|
+
_context4.next = 4;
|
|
706
761
|
break;
|
|
707
762
|
}
|
|
708
|
-
return
|
|
763
|
+
return _context4.abrupt("return", console.debug('查询标签缺少必要参数-shopId'));
|
|
709
764
|
case 4:
|
|
710
765
|
oldMemberLevel = form.getFieldValue("".concat(labelComponent.uniqueKey));
|
|
711
766
|
if (tid) {
|
|
712
|
-
|
|
767
|
+
_context4.next = 8;
|
|
713
768
|
break;
|
|
714
769
|
}
|
|
715
770
|
if (oldMemberLevel.length !== 0) {
|
|
716
771
|
form.setFieldsValue(_defineProperty({}, "".concat(labelComponent.uniqueKey), []));
|
|
717
772
|
}
|
|
718
|
-
return
|
|
773
|
+
return _context4.abrupt("return", console.debug('查询标签缺少必要参数-tradeId'));
|
|
719
774
|
case 8:
|
|
720
|
-
|
|
775
|
+
_context4.next = 10;
|
|
721
776
|
return queryMemberLevel({
|
|
722
777
|
tid: tid,
|
|
723
778
|
shopId: shopId
|
|
724
779
|
});
|
|
725
780
|
case 10:
|
|
726
|
-
_yield$queryMemberLev =
|
|
781
|
+
_yield$queryMemberLev = _context4.sent;
|
|
727
782
|
_yield$queryMemberLev2 = _yield$queryMemberLev.data;
|
|
728
783
|
data = _yield$queryMemberLev2 === void 0 ? [] : _yield$queryMemberLev2;
|
|
729
784
|
if (!isEqual(oldMemberLevel, data)) {
|
|
@@ -731,31 +786,31 @@ var FormRender = function FormRender(props, ref) {
|
|
|
731
786
|
}
|
|
732
787
|
case 14:
|
|
733
788
|
case "end":
|
|
734
|
-
return
|
|
789
|
+
return _context4.stop();
|
|
735
790
|
}
|
|
736
|
-
},
|
|
791
|
+
}, _callee4);
|
|
737
792
|
}));
|
|
738
|
-
return function queryMemberLevels(
|
|
739
|
-
return
|
|
793
|
+
return function queryMemberLevels(_x7, _x8) {
|
|
794
|
+
return _ref5.apply(this, arguments);
|
|
740
795
|
};
|
|
741
796
|
}();
|
|
742
797
|
|
|
743
798
|
//订单返填
|
|
744
799
|
var changeHandle = /*#__PURE__*/function () {
|
|
745
|
-
var
|
|
746
|
-
return _regeneratorRuntime().wrap(function
|
|
747
|
-
while (1) switch (
|
|
800
|
+
var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(order_no) {
|
|
801
|
+
return _regeneratorRuntime().wrap(function _callee5$(_context5) {
|
|
802
|
+
while (1) switch (_context5.prev = _context5.next) {
|
|
748
803
|
case 0:
|
|
749
804
|
if (order_no) {
|
|
750
|
-
|
|
805
|
+
_context5.next = 2;
|
|
751
806
|
break;
|
|
752
807
|
}
|
|
753
|
-
return
|
|
808
|
+
return _context5.abrupt("return");
|
|
754
809
|
case 2:
|
|
755
810
|
// console.log('[订单返填 changeHandle order_no ] >', order_no);
|
|
756
811
|
|
|
757
812
|
sessionStorage.setItem('order_no_test', order_no);
|
|
758
|
-
|
|
813
|
+
_context5.next = 5;
|
|
759
814
|
return orderBack({
|
|
760
815
|
order_no: order_no,
|
|
761
816
|
form: form,
|
|
@@ -778,12 +833,12 @@ var FormRender = function FormRender(props, ref) {
|
|
|
778
833
|
});
|
|
779
834
|
case 5:
|
|
780
835
|
case "end":
|
|
781
|
-
return
|
|
836
|
+
return _context5.stop();
|
|
782
837
|
}
|
|
783
|
-
},
|
|
838
|
+
}, _callee5);
|
|
784
839
|
}));
|
|
785
|
-
return function changeHandle(
|
|
786
|
-
return
|
|
840
|
+
return function changeHandle(_x9) {
|
|
841
|
+
return _ref6.apply(this, arguments);
|
|
787
842
|
};
|
|
788
843
|
}();
|
|
789
844
|
// 组件值变化
|
|
@@ -864,16 +919,16 @@ var FormRender = function FormRender(props, ref) {
|
|
|
864
919
|
|
|
865
920
|
//组件失焦事件
|
|
866
921
|
var componentOnBlur = /*#__PURE__*/function () {
|
|
867
|
-
var
|
|
922
|
+
var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(value, type) {
|
|
868
923
|
var promises;
|
|
869
|
-
return _regeneratorRuntime().wrap(function
|
|
870
|
-
while (1) switch (
|
|
924
|
+
return _regeneratorRuntime().wrap(function _callee6$(_context6) {
|
|
925
|
+
while (1) switch (_context6.prev = _context6.next) {
|
|
871
926
|
case 0:
|
|
872
927
|
if (!(type === 'erpAfterSaleTradeId')) {
|
|
873
|
-
|
|
928
|
+
_context6.next = 5;
|
|
874
929
|
break;
|
|
875
930
|
}
|
|
876
|
-
|
|
931
|
+
_context6.next = 3;
|
|
877
932
|
return onBlurErpAfterSaleTradeId({
|
|
878
933
|
form: form,
|
|
879
934
|
value: value,
|
|
@@ -881,14 +936,14 @@ var FormRender = function FormRender(props, ref) {
|
|
|
881
936
|
setKmLoading: setKmLoading
|
|
882
937
|
});
|
|
883
938
|
case 3:
|
|
884
|
-
|
|
939
|
+
_context6.next = 36;
|
|
885
940
|
break;
|
|
886
941
|
case 5:
|
|
887
942
|
if (!(type === 'expressLogisticsCode')) {
|
|
888
|
-
|
|
943
|
+
_context6.next = 13;
|
|
889
944
|
break;
|
|
890
945
|
}
|
|
891
|
-
|
|
946
|
+
_context6.next = 8;
|
|
892
947
|
return onBlurExpressLogisticsCode({
|
|
893
948
|
form: form,
|
|
894
949
|
value: value,
|
|
@@ -897,41 +952,53 @@ var FormRender = function FormRender(props, ref) {
|
|
|
897
952
|
componentOnBlur: componentOnBlur
|
|
898
953
|
});
|
|
899
954
|
case 8:
|
|
900
|
-
|
|
955
|
+
if (!['TR3E2FYXFZCFANVG6O6AALSM', 'SZF4ZGWZSNW6PYXMCIFEWBXT'].includes(companyKey)) {
|
|
956
|
+
_context6.next = 11;
|
|
957
|
+
break;
|
|
958
|
+
}
|
|
959
|
+
_context6.next = 11;
|
|
960
|
+
return onBlurSkxLogisticsCode({
|
|
961
|
+
form: form,
|
|
962
|
+
value: value,
|
|
963
|
+
templateDetail: templateDetail,
|
|
964
|
+
componentOnBlur: componentOnBlur
|
|
965
|
+
});
|
|
966
|
+
case 11:
|
|
967
|
+
_context6.next = 36;
|
|
901
968
|
break;
|
|
902
|
-
case
|
|
969
|
+
case 13:
|
|
903
970
|
if (!(type === 'skxOutboundNoticeNo')) {
|
|
904
|
-
|
|
971
|
+
_context6.next = 19;
|
|
905
972
|
break;
|
|
906
973
|
}
|
|
907
974
|
//[SKX]ON出库通知单号 返填
|
|
908
975
|
console.log('skxOutboundNoticeNo', value);
|
|
909
|
-
|
|
976
|
+
_context6.next = 17;
|
|
910
977
|
return onBlurSkxOutboundNoticeNo({
|
|
911
978
|
form: form,
|
|
912
979
|
value: value,
|
|
913
980
|
templateDetail: templateDetail,
|
|
914
981
|
componentOnBlur: componentOnBlur
|
|
915
982
|
});
|
|
916
|
-
case
|
|
917
|
-
|
|
983
|
+
case 17:
|
|
984
|
+
_context6.next = 36;
|
|
918
985
|
break;
|
|
919
|
-
case
|
|
986
|
+
case 19:
|
|
920
987
|
if (!(type === 'skxReturnBillNo')) {
|
|
921
|
-
|
|
988
|
+
_context6.next = 24;
|
|
922
989
|
break;
|
|
923
990
|
}
|
|
924
|
-
|
|
991
|
+
_context6.next = 22;
|
|
925
992
|
return onBlurSkxReturnBillNo({
|
|
926
993
|
form: form,
|
|
927
994
|
value: value,
|
|
928
995
|
templateDetail: templateDetail,
|
|
929
996
|
componentOnBlur: componentOnBlur
|
|
930
997
|
});
|
|
931
|
-
case
|
|
932
|
-
|
|
998
|
+
case 22:
|
|
999
|
+
_context6.next = 36;
|
|
933
1000
|
break;
|
|
934
|
-
case
|
|
1001
|
+
case 24:
|
|
935
1002
|
// 收集所有需要执行的异步操作
|
|
936
1003
|
promises = [];
|
|
937
1004
|
if (type === 'tradeId') {
|
|
@@ -943,7 +1010,7 @@ var FormRender = function FormRender(props, ref) {
|
|
|
943
1010
|
promises.push(handleChangeTradeId(value));
|
|
944
1011
|
}
|
|
945
1012
|
if (value) {
|
|
946
|
-
|
|
1013
|
+
_context6.next = 31;
|
|
947
1014
|
break;
|
|
948
1015
|
}
|
|
949
1016
|
setReplaceValue(function (prev) {
|
|
@@ -953,26 +1020,26 @@ var FormRender = function FormRender(props, ref) {
|
|
|
953
1020
|
return _objectSpread(_objectSpread({}, prev), {}, _defineProperty({}, type, 0));
|
|
954
1021
|
});
|
|
955
1022
|
replaceValueRef.current = _objectSpread(_objectSpread({}, replaceValue), {}, _defineProperty({}, type, 0));
|
|
956
|
-
return
|
|
957
|
-
case
|
|
1023
|
+
return _context6.abrupt("return");
|
|
1024
|
+
case 31:
|
|
958
1025
|
promises.push(queryReplaceCount(_defineProperty({}, type, value), templateDetail));
|
|
959
1026
|
// TODO: ERP不走订单反弹逻辑
|
|
960
1027
|
if ((type === 'tradeId' || type === 'enterprisePaymentTid') && !isErpUse) {
|
|
961
1028
|
promises.push(changeHandle(value));
|
|
962
1029
|
}
|
|
963
1030
|
// 等待所有异步操作完成
|
|
964
|
-
|
|
1031
|
+
_context6.next = 35;
|
|
965
1032
|
return Promise.all(promises);
|
|
966
|
-
case
|
|
967
|
-
return
|
|
968
|
-
case
|
|
1033
|
+
case 35:
|
|
1034
|
+
return _context6.abrupt("return", Promise.resolve());
|
|
1035
|
+
case 36:
|
|
969
1036
|
case "end":
|
|
970
|
-
return
|
|
1037
|
+
return _context6.stop();
|
|
971
1038
|
}
|
|
972
|
-
},
|
|
1039
|
+
}, _callee6);
|
|
973
1040
|
}));
|
|
974
|
-
return function componentOnBlur(
|
|
975
|
-
return
|
|
1041
|
+
return function componentOnBlur(_x10, _x11) {
|
|
1042
|
+
return _ref7.apply(this, arguments);
|
|
976
1043
|
};
|
|
977
1044
|
}();
|
|
978
1045
|
// 切换店铺
|
|
@@ -1176,9 +1243,9 @@ var FormRender = function FormRender(props, ref) {
|
|
|
1176
1243
|
var newComponentConfig = _objectSpread(_objectSpread({}, componentConfig), {}, {
|
|
1177
1244
|
disabled: disabled
|
|
1178
1245
|
});
|
|
1179
|
-
var
|
|
1180
|
-
upgrade =
|
|
1181
|
-
created =
|
|
1246
|
+
var _ref8 = (componentConfig === null || componentConfig === void 0 ? void 0 : componentConfig.status) || {},
|
|
1247
|
+
upgrade = _ref8.upgrade,
|
|
1248
|
+
created = _ref8.created;
|
|
1182
1249
|
if (['REISSUE_TRADE_ID', 'EXCHANGE_TRADE_ID', 'ERP_AFTER_SALE_TRADE_ID'].includes(workOrderComponentType)) {
|
|
1183
1250
|
// 售后单id、补发单id和换货单id默认值是可见不可编辑（2）
|
|
1184
1251
|
if (typeof upgrade !== 'number') {
|
|
@@ -1247,8 +1314,8 @@ var FormRender = function FormRender(props, ref) {
|
|
|
1247
1314
|
return /*#__PURE__*/React.createElement(Form.Item, {
|
|
1248
1315
|
noStyle: true,
|
|
1249
1316
|
dependencies: _toConsumableArray(new Set(dependencies.concat(currentDependenciesMappingComponent)))
|
|
1250
|
-
}, function (
|
|
1251
|
-
var getFieldValue =
|
|
1317
|
+
}, function (_ref9) {
|
|
1318
|
+
var getFieldValue = _ref9.getFieldValue;
|
|
1252
1319
|
var show = currentIdDependenceOtherFields === null || currentIdDependenceOtherFields === void 0 ? void 0 : currentIdDependenceOtherFields.reduce(function (cur, nxt) {
|
|
1253
1320
|
// 如果有一项满足展示条件则展示
|
|
1254
1321
|
if (cur) {
|
|
@@ -24,3 +24,9 @@ export declare const onBlurSkxReturnBillNo: ({ form, value, templateDetail, comp
|
|
|
24
24
|
templateDetail: any;
|
|
25
25
|
componentOnBlur: (value: any, type: string) => Promise<void>;
|
|
26
26
|
}) => Promise<void>;
|
|
27
|
+
export declare const onBlurSkxLogisticsCode: ({ form, value, templateDetail, componentOnBlur, }: {
|
|
28
|
+
form: FormInstance;
|
|
29
|
+
value: string;
|
|
30
|
+
templateDetail: any;
|
|
31
|
+
componentOnBlur: (value: any, type: string) => Promise<void>;
|
|
32
|
+
}) => Promise<void>;
|
|
@@ -261,4 +261,68 @@ export var onBlurSkxReturnBillNo = /*#__PURE__*/function () {
|
|
|
261
261
|
return function onBlurSkxReturnBillNo(_x5) {
|
|
262
262
|
return _ref9.apply(this, arguments);
|
|
263
263
|
};
|
|
264
|
+
}();
|
|
265
|
+
export var onBlurSkxLogisticsCode = /*#__PURE__*/function () {
|
|
266
|
+
var _ref12 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(_ref11) {
|
|
267
|
+
var form, value, templateDetail, componentOnBlur, hasTradeIdComponent;
|
|
268
|
+
return _regeneratorRuntime().wrap(function _callee8$(_context8) {
|
|
269
|
+
while (1) switch (_context8.prev = _context8.next) {
|
|
270
|
+
case 0:
|
|
271
|
+
form = _ref11.form, value = _ref11.value, templateDetail = _ref11.templateDetail, componentOnBlur = _ref11.componentOnBlur;
|
|
272
|
+
if (value) {
|
|
273
|
+
_context8.next = 3;
|
|
274
|
+
break;
|
|
275
|
+
}
|
|
276
|
+
return _context8.abrupt("return");
|
|
277
|
+
case 3:
|
|
278
|
+
hasTradeIdComponent = templateDetail.componentDtoList.some(function (item) {
|
|
279
|
+
return item.workOrderComponentType === 'TRADE_ID_INPUT';
|
|
280
|
+
});
|
|
281
|
+
if (hasTradeIdComponent) {
|
|
282
|
+
_context8.next = 6;
|
|
283
|
+
break;
|
|
284
|
+
}
|
|
285
|
+
return _context8.abrupt("return");
|
|
286
|
+
case 6:
|
|
287
|
+
_context8.next = 8;
|
|
288
|
+
return servers.SKX.queryReturnOrderDetailSingleton({
|
|
289
|
+
expressCode: value
|
|
290
|
+
}).then( /*#__PURE__*/function () {
|
|
291
|
+
var _ref13 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(res) {
|
|
292
|
+
var data, tradeId, oldValue, blurPromise;
|
|
293
|
+
return _regeneratorRuntime().wrap(function _callee7$(_context7) {
|
|
294
|
+
while (1) switch (_context7.prev = _context7.next) {
|
|
295
|
+
case 0:
|
|
296
|
+
data = res.data;
|
|
297
|
+
tradeId = data === null || data === void 0 ? void 0 : data.tid;
|
|
298
|
+
oldValue = form.getFieldValue('0eVTfMGEyd'); // 创建一个异步操作的Promise
|
|
299
|
+
blurPromise = componentOnBlur(tradeId, 'tradeId'); // 等待异步操作完成后再执行setTimeout
|
|
300
|
+
_context7.next = 6;
|
|
301
|
+
return blurPromise;
|
|
302
|
+
case 6:
|
|
303
|
+
// // 所有异步操作完成后执行
|
|
304
|
+
|
|
305
|
+
form.setFieldsValue({
|
|
306
|
+
m3ap1EvEyd: tradeId,
|
|
307
|
+
'0eVTfMGEyd': oldValue
|
|
308
|
+
});
|
|
309
|
+
case 7:
|
|
310
|
+
case "end":
|
|
311
|
+
return _context7.stop();
|
|
312
|
+
}
|
|
313
|
+
}, _callee7);
|
|
314
|
+
}));
|
|
315
|
+
return function (_x8) {
|
|
316
|
+
return _ref13.apply(this, arguments);
|
|
317
|
+
};
|
|
318
|
+
}()).catch(console.debug);
|
|
319
|
+
case 8:
|
|
320
|
+
case "end":
|
|
321
|
+
return _context8.stop();
|
|
322
|
+
}
|
|
323
|
+
}, _callee8);
|
|
324
|
+
}));
|
|
325
|
+
return function onBlurSkxLogisticsCode(_x7) {
|
|
326
|
+
return _ref12.apply(this, arguments);
|
|
327
|
+
};
|
|
264
328
|
}();
|
|
@@ -27,7 +27,7 @@ import { calcWorkOrderList, deleteCacheOrder, submitParams } from "../common/uti
|
|
|
27
27
|
import { useMemoizedFn } from 'ahooks';
|
|
28
28
|
import moment from 'moment';
|
|
29
29
|
import { fetchPanelInfo, fetchAllFlowOperateRecord, fetchCollectOrder } from "./store/reducers";
|
|
30
|
-
import { selectFlowRecordList, selectRemarkRecordList, selectCurrentNodeDetail, selectTid, selectShopUniqueKey, selectOperateParams, selectFlowStatus, selectCurrentTradeIdWOrkOrderNumber, selectFlowTemplateId, selectLoading, selectOrderBackLoading, selectOrderBackKmLoading, selectWithDrawOrder, selectNodeAssistantMap, selectFlowTemplateType, selectFollow } from "./store/selector";
|
|
30
|
+
import { selectFlowRecordList, selectRemarkRecordList, selectCurrentNodeDetail, selectTid, selectShopUniqueKey, selectOperateParams, selectFlowStatus, selectCurrentTradeIdWOrkOrderNumber, selectFlowTemplateId, selectLoading, selectOrderBackLoading, selectOrderBackKmLoading, selectWithDrawOrder, selectNodeAssistantMap, selectFlowTemplateType, selectFollow, selectAutoSubmitFlag } from "./store/selector";
|
|
31
31
|
import { NodeType, FlowStatus, FlowType } from "../model/flowTemplateDetail/types";
|
|
32
32
|
import NodeItem from "./components/Item";
|
|
33
33
|
import CurrentNode from "./components/CurrentNode";
|
|
@@ -61,7 +61,7 @@ import { PlatForm } from "../WorkOrder/types";
|
|
|
61
61
|
var Text = Typography.Text,
|
|
62
62
|
Link = Typography.Link;
|
|
63
63
|
var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
64
|
-
var _currentNodeDetail$wo, _currentNodeDetail$no, _currentNodeDetail$wo2, _shopList$find, _JSON$parse, _currentNodeDetail$
|
|
64
|
+
var _currentNodeDetail$wo, _currentNodeDetail$no, _currentNodeDetail$wo2, _shopList$find, _JSON$parse, _currentNodeDetail$wo30, _currentNodeDetail$wo31, _currentNodeDetail$wo32, _currentNodeDetail$wo33, _currentNodeDetail$no21, _currentNodeDetail$no22, _currentNodeDetail$no23, _currentNodeDetail$no24;
|
|
65
65
|
var flowTemplateKey = props.flowTemplateKey,
|
|
66
66
|
_props$shopList = props.shopList,
|
|
67
67
|
shopList = _props$shopList === void 0 ? [] : _props$shopList,
|
|
@@ -97,6 +97,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
97
97
|
var loading = useSelector(selectLoading);
|
|
98
98
|
var orderBackLoading = useSelector(selectOrderBackLoading);
|
|
99
99
|
var orderBackKmLoading = useSelector(selectOrderBackKmLoading);
|
|
100
|
+
var autoSubmitFlag = useSelector(selectAutoSubmitFlag);
|
|
100
101
|
var withdrawWorkOrderDetail = useSelector(selectWithDrawOrder);
|
|
101
102
|
var assistantMap = useSelector(selectNodeAssistantMap);
|
|
102
103
|
var flowTemplateType = useSelector(selectFlowTemplateType);
|
|
@@ -1090,31 +1091,40 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
1090
1091
|
payload: plat
|
|
1091
1092
|
});
|
|
1092
1093
|
}, [plat]);
|
|
1094
|
+
var autoSubmitFn = function autoSubmitFn() {
|
|
1095
|
+
var _currentNodeDetail$wo24;
|
|
1096
|
+
// TODO: 兼容后端一些时候生成的数据异常情况，防止批量提交出现卡顿不执行情况
|
|
1097
|
+
if (isEmpty(currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrder) && typeof callbackAutoSubmitResult === 'function') {
|
|
1098
|
+
return callbackAutoSubmitResult({
|
|
1099
|
+
success: false,
|
|
1100
|
+
message: '当前流程工单无工单数据,请联系实施处理'
|
|
1101
|
+
});
|
|
1102
|
+
}
|
|
1103
|
+
if (flowWorkOrderId === (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo24 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo24 === void 0 ? void 0 : _currentNodeDetail$wo24.flowWorkOrderId)) {
|
|
1104
|
+
setTimeout(function () {
|
|
1105
|
+
handleSubmit();
|
|
1106
|
+
}, 0);
|
|
1107
|
+
}
|
|
1108
|
+
};
|
|
1093
1109
|
useEffect(function () {
|
|
1094
1110
|
if (autoSubmit && !isNull(currentNodeDetail)) {
|
|
1095
|
-
var _currentNodeDetail$
|
|
1096
|
-
//
|
|
1097
|
-
if (
|
|
1098
|
-
|
|
1099
|
-
|
|
1100
|
-
|
|
1101
|
-
});
|
|
1102
|
-
}
|
|
1103
|
-
if (flowWorkOrderId === (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo24 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo24 === void 0 ? void 0 : _currentNodeDetail$wo24.flowWorkOrderId)) {
|
|
1104
|
-
setTimeout(function () {
|
|
1105
|
-
handleSubmit();
|
|
1106
|
-
}, 0);
|
|
1111
|
+
var _currentNodeDetail$wo25, _currentNodeDetail$wo26;
|
|
1112
|
+
// SKX首节点满足下列条件、此时批量提交会等订单数据反填再提交, 其余企业批量提交还是原先逻辑，不涉及订单数据反填
|
|
1113
|
+
if (currentNodeDetail !== null && currentNodeDetail !== void 0 && (_currentNodeDetail$wo25 = currentNodeDetail.workOrder) !== null && _currentNodeDetail$wo25 !== void 0 && _currentNodeDetail$wo25.notAutoFillWithFirstSubmit && autoSubmitFlag) {
|
|
1114
|
+
autoSubmitFn();
|
|
1115
|
+
} else if (!(currentNodeDetail !== null && currentNodeDetail !== void 0 && (_currentNodeDetail$wo26 = currentNodeDetail.workOrder) !== null && _currentNodeDetail$wo26 !== void 0 && _currentNodeDetail$wo26.notAutoFillWithFirstSubmit) && !autoSubmitFlag) {
|
|
1116
|
+
autoSubmitFn();
|
|
1107
1117
|
}
|
|
1108
1118
|
}
|
|
1109
|
-
}, [currentNodeDetail]);
|
|
1119
|
+
}, [currentNodeDetail, autoSubmitFlag]);
|
|
1110
1120
|
var isCurrentNodeHandler = useMemo(function () {
|
|
1111
|
-
var _currentNodeDetail$no11, _currentNodeDetail$no12, _currentNodeDetail$no13, _currentNodeDetail$no14, _currentNodeDetail$no15, _currentNodeDetail$no16, _currentNodeDetail$
|
|
1121
|
+
var _currentNodeDetail$no11, _currentNodeDetail$no12, _currentNodeDetail$no13, _currentNodeDetail$no14, _currentNodeDetail$no15, _currentNodeDetail$no16, _currentNodeDetail$wo27, _currentNodeDetail$no17, _currentNodeDetail$no18;
|
|
1112
1122
|
return currentUserHasOperatorAuth({
|
|
1113
1123
|
assistantList: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no11 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no11 === void 0 ? void 0 : _currentNodeDetail$no11.id) && assistantMap[currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no12 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no12 === void 0 ? void 0 : _currentNodeDetail$no12.id] || [],
|
|
1114
1124
|
currentUserKey: plat.userKey,
|
|
1115
1125
|
staffIds: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no13 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no13 === void 0 ? void 0 : (_currentNodeDetail$no14 = _currentNodeDetail$no13.assistants) === null || _currentNodeDetail$no14 === void 0 ? void 0 : _currentNodeDetail$no14.staffIds) || [],
|
|
1116
1126
|
operateDataPermission: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no15 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no15 === void 0 ? void 0 : (_currentNodeDetail$no16 = _currentNodeDetail$no15.assistants) === null || _currentNodeDetail$no16 === void 0 ? void 0 : _currentNodeDetail$no16.operateDataPermission,
|
|
1117
|
-
handlerList: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
1127
|
+
handlerList: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo27 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo27 === void 0 ? void 0 : _currentNodeDetail$wo27.handlerList) || [],
|
|
1118
1128
|
isAllStaff: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no17 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no17 === void 0 ? void 0 : (_currentNodeDetail$no18 = _currentNodeDetail$no17.assistants) === null || _currentNodeDetail$no18 === void 0 ? void 0 : _currentNodeDetail$no18.isAllStaff
|
|
1119
1129
|
});
|
|
1120
1130
|
}, [currentNodeDetail, plat, assistantMap]);
|
|
@@ -1123,9 +1133,9 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
1123
1133
|
return item.accessToken === (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no19 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no19 === void 0 ? void 0 : (_currentNodeDetail$no20 = _currentNodeDetail$no19.relationEvent) === null || _currentNodeDetail$no20 === void 0 ? void 0 : _currentNodeDetail$no20.defaultShopUniqueKey);
|
|
1124
1134
|
})) === null || _shopList$find === void 0 ? void 0 : _shopList$find.shopId;
|
|
1125
1135
|
var ReportOrderRender = function ReportOrderRender(props) {
|
|
1126
|
-
var _currentNodeDetail$
|
|
1136
|
+
var _currentNodeDetail$wo28, _currentNodeDetail$wo29;
|
|
1127
1137
|
var details = props.details;
|
|
1128
|
-
var componentDtoList = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
1138
|
+
var componentDtoList = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo28 = currentNodeDetail.workOrderTemplateInfo) === null || _currentNodeDetail$wo28 === void 0 ? void 0 : _currentNodeDetail$wo28.componentDtoList.filter(function (t) {
|
|
1129
1139
|
return !CANNOT_BACK_FILL.includes(t.workOrderComponentType || '');
|
|
1130
1140
|
});
|
|
1131
1141
|
//获取可以返填的组件值
|
|
@@ -1133,7 +1143,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
1133
1143
|
_calcWorkOrderList2 = _slicedToArray(_calcWorkOrderList, 1),
|
|
1134
1144
|
transData = _calcWorkOrderList2[0];
|
|
1135
1145
|
//获取表单显示值
|
|
1136
|
-
var _calcWorkOrderList3 = calcWorkOrderList([details], currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
1146
|
+
var _calcWorkOrderList3 = calcWorkOrderList([details], currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo29 = currentNodeDetail.workOrderTemplateInfo) === null || _currentNodeDetail$wo29 === void 0 ? void 0 : _currentNodeDetail$wo29.componentDtoList),
|
|
1137
1147
|
_calcWorkOrderList4 = _slicedToArray(_calcWorkOrderList3, 1),
|
|
1138
1148
|
transDataall = _calcWorkOrderList4[0];
|
|
1139
1149
|
return /*#__PURE__*/React.createElement("div", {
|
|
@@ -1231,9 +1241,9 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
1231
1241
|
}), shopItem === null || shopItem === void 0 ? void 0 : shopItem.shopName, "-"), /*#__PURE__*/React.createElement("span", null, flowWorkOrderId), /*#__PURE__*/React.createElement(Button, {
|
|
1232
1242
|
type: "link",
|
|
1233
1243
|
onClick: handleFollow
|
|
1234
|
-
}, !follow ? '关注' : '已关注')), /*#__PURE__*/React.createElement("div", null, (_JSON$parse = JSON.parse((currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
1244
|
+
}, !follow ? '关注' : '已关注')), /*#__PURE__*/React.createElement("div", null, (_JSON$parse = JSON.parse((currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo30 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo30 === void 0 ? void 0 : (_currentNodeDetail$wo31 = _currentNodeDetail$wo30.jsonMap) === null || _currentNodeDetail$wo31 === void 0 ? void 0 : _currentNodeDetail$wo31.flowTags) || '[]')) !== null && _JSON$parse !== void 0 && _JSON$parse.includes('AI_BUILD') ? /*#__PURE__*/React.createElement(Tag, {
|
|
1235
1245
|
color: "blue"
|
|
1236
|
-
}, "AI\u81EA\u52A8\u5EFA\u5355-".concat(WORK_ORDER_STATUS_AI_BUILD[currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
1246
|
+
}, "AI\u81EA\u52A8\u5EFA\u5355-".concat(WORK_ORDER_STATUS_AI_BUILD[currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo32 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo32 === void 0 ? void 0 : (_currentNodeDetail$wo33 = _currentNodeDetail$wo32.jsonMap) === null || _currentNodeDetail$wo33 === void 0 ? void 0 : _currentNodeDetail$wo33.flowStatus])) : null)), flowStatus && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Row, {
|
|
1237
1247
|
justify: 'space-between',
|
|
1238
1248
|
className: "header"
|
|
1239
1249
|
}, /*#__PURE__*/React.createElement(Col, null, /*#__PURE__*/React.createElement("div", {
|
|
@@ -40,6 +40,7 @@ export declare const clearLabelList: (state: FlowTemplateDetailState) => void;
|
|
|
40
40
|
export declare const setRejectLoading: (state: FlowTemplateDetailState, { payload }: PayloadAction<boolean>) => void;
|
|
41
41
|
export declare const setWithDrawLoading: (state: FlowTemplateDetailState, { payload }: PayloadAction<boolean>) => void;
|
|
42
42
|
export declare const setFollow: (state: FlowTemplateDetailState, { payload }: PayloadAction<boolean>) => void;
|
|
43
|
+
export declare const setaAutoSubmitFlag: (state: FlowTemplateDetailState, { payload }: PayloadAction<boolean>) => void;
|
|
43
44
|
declare const reducers: (state: FlowTemplateDetailState | undefined, action: {
|
|
44
45
|
type: string;
|
|
45
46
|
payload: any;
|
|
@@ -86,5 +87,6 @@ declare const reducers: (state: FlowTemplateDetailState | undefined, action: {
|
|
|
86
87
|
rejectLoading: boolean;
|
|
87
88
|
withdrawLoading: boolean;
|
|
88
89
|
follow: boolean;
|
|
90
|
+
autoSubmitFlag: boolean;
|
|
89
91
|
};
|
|
90
92
|
export default reducers;
|
|
@@ -46,8 +46,10 @@ export var initState = {
|
|
|
46
46
|
labelList: [],
|
|
47
47
|
rejectLoading: false,
|
|
48
48
|
withdrawLoading: false,
|
|
49
|
-
follow: false
|
|
49
|
+
follow: false,
|
|
50
|
+
autoSubmitFlag: false // 批量提交可操作标识
|
|
50
51
|
};
|
|
52
|
+
|
|
51
53
|
export var fetchPanelInfo = function fetchPanelInfo(params, options) {
|
|
52
54
|
return /*#__PURE__*/function () {
|
|
53
55
|
var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(dispatch) {
|
|
@@ -454,6 +456,10 @@ export var setFollow = function setFollow(state, _ref29) {
|
|
|
454
456
|
var payload = _ref29.payload;
|
|
455
457
|
state.follow = payload;
|
|
456
458
|
};
|
|
459
|
+
export var setaAutoSubmitFlag = function setaAutoSubmitFlag(state, _ref30) {
|
|
460
|
+
var payload = _ref30.payload;
|
|
461
|
+
state.autoSubmitFlag = payload;
|
|
462
|
+
};
|
|
457
463
|
var reducerMap = {
|
|
458
464
|
setNodeAssistantInfo: setNodeAssistantInfo,
|
|
459
465
|
setLoading: setLoading,
|
|
@@ -480,7 +486,8 @@ var reducerMap = {
|
|
|
480
486
|
clearLabelList: clearLabelList,
|
|
481
487
|
setRejectLoading: setRejectLoading,
|
|
482
488
|
setWithDrawLoading: setWithDrawLoading,
|
|
483
|
-
setFollow: setFollow
|
|
489
|
+
setFollow: setFollow,
|
|
490
|
+
setaAutoSubmitFlag: setaAutoSubmitFlag
|
|
484
491
|
};
|
|
485
492
|
var reducers = function reducers() {
|
|
486
493
|
var state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initState;
|
|
@@ -262,6 +262,7 @@ export declare const selectFlowTemplateId: (state: FlowTemplateDetailState) => s
|
|
|
262
262
|
export declare const selectLoading: (state: FlowTemplateDetailState) => boolean;
|
|
263
263
|
export declare const selectOrderBackLoading: (state: FlowTemplateDetailState) => boolean;
|
|
264
264
|
export declare const selectOrderBackKmLoading: (state: FlowTemplateDetailState) => boolean;
|
|
265
|
+
export declare const selectAutoSubmitFlag: (state: FlowTemplateDetailState) => boolean;
|
|
265
266
|
export declare const selectCurrentFlowAllShowHideRules: (state: FlowTemplateDetailState) => import("../../model/flowTemplateDetail/types").CurrentFlowShowHideRules;
|
|
266
267
|
export declare const selectWithDrawOrder: (state: FlowTemplateDetailState) => {
|
|
267
268
|
nodeId: string;
|
|
@@ -50,6 +50,9 @@ export var selectOrderBackLoading = function selectOrderBackLoading(state) {
|
|
|
50
50
|
export var selectOrderBackKmLoading = function selectOrderBackKmLoading(state) {
|
|
51
51
|
return state.orderBackKmLoading;
|
|
52
52
|
};
|
|
53
|
+
export var selectAutoSubmitFlag = function selectAutoSubmitFlag(state) {
|
|
54
|
+
return state.autoSubmitFlag;
|
|
55
|
+
};
|
|
53
56
|
export var selectCurrentFlowAllShowHideRules = function selectCurrentFlowAllShowHideRules(state) {
|
|
54
57
|
return state.currentFlowAllShowHideRules;
|
|
55
58
|
};
|
|
@@ -826,7 +826,7 @@ export var submitParams = function submitParams(_ref4) {
|
|
|
826
826
|
}, operateParams)
|
|
827
827
|
};
|
|
828
828
|
if (update) {
|
|
829
|
-
var _currentNodeDetail$wo, _currentNodeDetail$wo2, _currentNodeDetail$wo3, _currentNodeDetail$wo4, _currentNodeDetail$wo5, _currentNodeDetail$wo6;
|
|
829
|
+
var _currentNodeDetail$wo, _currentNodeDetail$wo2, _currentNodeDetail$wo3, _currentNodeDetail$wo4, _currentNodeDetail$wo5, _currentNodeDetail$wo6, _currentNodeDetail$wo7;
|
|
830
830
|
params.updateInfo = {
|
|
831
831
|
templateId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo === void 0 ? void 0 : _currentNodeDetail$wo.templateId,
|
|
832
832
|
workOrderId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo2 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo2 === void 0 ? void 0 : _currentNodeDetail$wo2.id,
|
|
@@ -870,25 +870,33 @@ export var submitParams = function submitParams(_ref4) {
|
|
|
870
870
|
dataValue: false
|
|
871
871
|
});
|
|
872
872
|
}
|
|
873
|
+
// TODO: 兼容后端导入Excel之后，订单未反填问题
|
|
874
|
+
if (update && currentNodeDetail !== null && currentNodeDetail !== void 0 && (_currentNodeDetail$wo7 = currentNodeDetail.workOrder) !== null && _currentNodeDetail$wo7 !== void 0 && _currentNodeDetail$wo7.notAutoFillWithFirstSubmit) {
|
|
875
|
+
updateList.push({
|
|
876
|
+
dataKey: 'notAutoFillWithFirstSubmit',
|
|
877
|
+
oldValue: true,
|
|
878
|
+
dataValue: false
|
|
879
|
+
});
|
|
880
|
+
}
|
|
873
881
|
params.updateInfo.updateList = updateList;
|
|
874
882
|
params.updateInfo.needTransForm = params.needTransForm;
|
|
875
883
|
delete params.workOrderUpdateKeyVos;
|
|
876
884
|
delete params.needTransForm;
|
|
877
885
|
} else {
|
|
878
|
-
var _Object$keys, _currentNodeDetail$
|
|
886
|
+
var _Object$keys, _currentNodeDetail$wo8, _currentNodeDetail$wo9, _currentNodeDetail$wo10, _currentNodeDetail$wo11, _currentNodeDetail$wo12, _currentNodeDetail$wo13, _currentNodeDetail$wo14, _currentNodeDetail$wo15, _currentNodeDetail$wo16, _currentNodeDetail$wo17, _currentNodeDetail$wo18;
|
|
879
887
|
// TODO: 新保存工单
|
|
880
888
|
// 获取当前表单中非空字段
|
|
881
889
|
var finalComponentList = (_Object$keys = Object.keys(formData)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.filter(function (i) {
|
|
882
890
|
return !isNull(formData[i]);
|
|
883
891
|
});
|
|
884
892
|
// 获取非空字段对应的组件
|
|
885
|
-
var finalDtoList = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
893
|
+
var finalDtoList = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo8 = currentNodeDetail.workOrderTemplateInfo) === null || _currentNodeDetail$wo8 === void 0 ? void 0 : (_currentNodeDetail$wo9 = _currentNodeDetail$wo8.componentDtoList) === null || _currentNodeDetail$wo9 === void 0 ? void 0 : _currentNodeDetail$wo9.filter(function (item) {
|
|
886
894
|
return finalComponentList.includes(item.uniqueKey) || item.workOrderComponentType === 'BUYER_MESSAGE_NOTICE';
|
|
887
895
|
});
|
|
888
896
|
set(newTemplateDetail, 'componentDtoList', finalDtoList);
|
|
889
897
|
params.workOrder = {
|
|
890
|
-
templateId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
891
|
-
handleWorkOrderId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
898
|
+
templateId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo10 = currentNodeDetail.workOrderTemplateInfo) === null || _currentNodeDetail$wo10 === void 0 ? void 0 : _currentNodeDetail$wo10.uniqueKey,
|
|
899
|
+
handleWorkOrderId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo11 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo11 === void 0 ? void 0 : _currentNodeDetail$wo11.id,
|
|
892
900
|
buyerNick: plat === null || plat === void 0 ? void 0 : plat.buyerNick,
|
|
893
901
|
buyerOpenUid: plat === null || plat === void 0 ? void 0 : plat.buyerId,
|
|
894
902
|
shopUniqueKey: shopUniqueKey,
|
|
@@ -898,13 +906,13 @@ export var submitParams = function submitParams(_ref4) {
|
|
|
898
906
|
};
|
|
899
907
|
|
|
900
908
|
// 判断是否有订单号组建，订单号数据需要特殊处理
|
|
901
|
-
var tradeIdUniqueKey = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
909
|
+
var tradeIdUniqueKey = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo12 = currentNodeDetail.workOrderTemplateInfo) === null || _currentNodeDetail$wo12 === void 0 ? void 0 : (_currentNodeDetail$wo13 = _currentNodeDetail$wo12.componentDtoList) === null || _currentNodeDetail$wo13 === void 0 ? void 0 : (_currentNodeDetail$wo14 = _currentNodeDetail$wo13.find(function (item) {
|
|
902
910
|
return item.workOrderComponentType === 'TRADE_ID_INPUT';
|
|
903
|
-
})) === null || _currentNodeDetail$
|
|
911
|
+
})) === null || _currentNodeDetail$wo14 === void 0 ? void 0 : _currentNodeDetail$wo14.uniqueKey;
|
|
904
912
|
// 判断是否有订单号组建，订单号数据需要特殊处理
|
|
905
|
-
var paymentTradeIdUniqueKey = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
913
|
+
var paymentTradeIdUniqueKey = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo15 = currentNodeDetail.workOrderTemplateInfo) === null || _currentNodeDetail$wo15 === void 0 ? void 0 : (_currentNodeDetail$wo16 = _currentNodeDetail$wo15.componentDtoList) === null || _currentNodeDetail$wo16 === void 0 ? void 0 : (_currentNodeDetail$wo17 = _currentNodeDetail$wo16.find(function (item) {
|
|
906
914
|
return item.workOrderComponentType === 'ENTERPRISE_PAYMENT';
|
|
907
|
-
})) === null || _currentNodeDetail$
|
|
915
|
+
})) === null || _currentNodeDetail$wo17 === void 0 ? void 0 : _currentNodeDetail$wo17.uniqueKey;
|
|
908
916
|
if (paymentTradeIdUniqueKey) {
|
|
909
917
|
var _formData;
|
|
910
918
|
params.workOrder.tid = formData === null || formData === void 0 ? void 0 : (_formData = formData["".concat(paymentTradeIdUniqueKey)]) === null || _formData === void 0 ? void 0 : _formData.enterprisePaymentTid;
|
|
@@ -915,7 +923,7 @@ export var submitParams = function submitParams(_ref4) {
|
|
|
915
923
|
if (formData !== null && formData !== void 0 && formData['fixed_field_buyerOpenUid']) {
|
|
916
924
|
params.workOrder.buyerOpenUid = formData === null || formData === void 0 ? void 0 : formData['fixed_field_buyerOpenUid'];
|
|
917
925
|
}
|
|
918
|
-
params.workOrder.workOrderComponents = submitDataTransOldFormat(formData, newTemplateDetail, !!(currentNodeDetail !== null && currentNodeDetail !== void 0 && (_currentNodeDetail$
|
|
926
|
+
params.workOrder.workOrderComponents = submitDataTransOldFormat(formData, newTemplateDetail, !!(currentNodeDetail !== null && currentNodeDetail !== void 0 && (_currentNodeDetail$wo18 = currentNodeDetail.workOrder) !== null && _currentNodeDetail$wo18 !== void 0 && _currentNodeDetail$wo18.id), currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrder, params.workOrder, (plat === null || plat === void 0 ? void 0 : plat.accountName) || '');
|
|
919
927
|
//端上有买家id 就返填当前买家 即使不是当前买家的订单
|
|
920
928
|
if (plat.platform !== PlatForm.PC && plat !== null && plat !== void 0 && plat.buyerId) {
|
|
921
929
|
params.workOrder.buyerOpenUid = plat === null || plat === void 0 ? void 0 : plat.buyerId;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kmkf-fe-packages/kmkf-work-order-service-component",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.9.0-rc.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": "2.
|
|
36
|
-
"@kmkf-fe-packages/kmkf-utils": "2.
|
|
37
|
-
"@kmkf-fe-packages/services-components": "2.
|
|
35
|
+
"@kmkf-fe-packages/basic-components": "2.9.0-rc.0",
|
|
36
|
+
"@kmkf-fe-packages/kmkf-utils": "2.9.0-rc.0",
|
|
37
|
+
"@kmkf-fe-packages/services-components": "2.9.0-rc.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": "b42dfb960ac3f140a6668c37243674aa5b4b444b",
|
|
77
77
|
"gitHooks": {
|
|
78
78
|
"pre-commit": "lint-staged"
|
|
79
79
|
}
|