@kmkf-fe-packages/kmkf-work-order-service-component 2.2.5-beta.14 → 2.2.5-beta.16
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.
|
@@ -478,7 +478,7 @@ var FormRender = function FormRender(props, ref) {
|
|
|
478
478
|
// 如果没有订单反填，则单独更新remark
|
|
479
479
|
fetchRemark(shopId, currentNodeTid);
|
|
480
480
|
case 35:
|
|
481
|
-
_context2.next =
|
|
481
|
+
_context2.next = 60;
|
|
482
482
|
break;
|
|
483
483
|
case 37:
|
|
484
484
|
fillByShopId(shopId);
|
|
@@ -498,55 +498,64 @@ var FormRender = function FormRender(props, ref) {
|
|
|
498
498
|
}
|
|
499
499
|
|
|
500
500
|
// console.log(orderNo, initFormValues);
|
|
501
|
-
if (initFormValues) {
|
|
502
|
-
|
|
503
|
-
|
|
504
|
-
|
|
505
|
-
|
|
506
|
-
|
|
507
|
-
|
|
508
|
-
|
|
509
|
-
|
|
510
|
-
|
|
511
|
-
|
|
512
|
-
|
|
513
|
-
|
|
514
|
-
|
|
515
|
-
|
|
516
|
-
|
|
517
|
-
|
|
518
|
-
|
|
519
|
-
|
|
520
|
-
|
|
521
|
-
|
|
522
|
-
|
|
523
|
-
|
|
524
|
-
|
|
525
|
-
|
|
526
|
-
|
|
527
|
-
|
|
528
|
-
|
|
529
|
-
|
|
530
|
-
|
|
531
|
-
|
|
532
|
-
|
|
533
|
-
|
|
534
|
-
|
|
535
|
-
callback: orderBackReplace,
|
|
536
|
-
fromQNCreateWorkOrderByOrderNo: fromQNCreateWorkOrderByOrderNo,
|
|
537
|
-
// TODO: 只有在千牛端通过订单号录入工单的时候，订单备注不需要反填
|
|
538
|
-
plat: plat,
|
|
539
|
-
callKey: 2,
|
|
540
|
-
setLoading: setLoading
|
|
541
|
-
});
|
|
542
|
-
queryLabels(orderNo, shopId);
|
|
543
|
-
queryMemberLevels(orderNo, shopId);
|
|
544
|
-
} else {
|
|
545
|
-
// 如果没有订单反填，则单独更新remark
|
|
546
|
-
fetchRemark(shopId, currentNodeTid);
|
|
547
|
-
}
|
|
501
|
+
if (!initFormValues) {
|
|
502
|
+
_context2.next = 48;
|
|
503
|
+
break;
|
|
504
|
+
}
|
|
505
|
+
form.setFieldsValue(_objectSpread(_objectSpread({}, initFormValues), {}, {
|
|
506
|
+
shopId: shopId
|
|
507
|
+
}));
|
|
508
|
+
// 没有触发订单反填的情况下，更新备注,
|
|
509
|
+
// PS: orderNo 和 shopId 可能需要从initFormValues中获取
|
|
510
|
+
_orderNo = orderNo;
|
|
511
|
+
_shopId = shopId || initFormValues['shopId'];
|
|
512
|
+
if (!_orderNo) {
|
|
513
|
+
orderNoField = ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).find(function (item) {
|
|
514
|
+
return (item === null || item === void 0 ? void 0 : item.workOrderComponentType) === 'TRADE_ID_INPUT';
|
|
515
|
+
});
|
|
516
|
+
_orderNo = orderNoField !== null && orderNoField !== void 0 && orderNoField.uniqueKey ? initFormValues[orderNoField === null || orderNoField === void 0 ? void 0 : orderNoField.uniqueKey] || _orderNo : _orderNo;
|
|
517
|
+
}
|
|
518
|
+
fetchRemark(_shopId, _orderNo);
|
|
519
|
+
_context2.next = 60;
|
|
520
|
+
break;
|
|
521
|
+
case 48:
|
|
522
|
+
_transData = calcWorkOrderList([{
|
|
523
|
+
jsonMap: jsonMap
|
|
524
|
+
}], [].concat(_toConsumableArray((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList) || []), _toConsumableArray((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || [])), 'init');
|
|
525
|
+
_initialValues = get(_transData, '0', {});
|
|
526
|
+
form.setFieldsValue(_objectSpread(_objectSpread({}, _initialValues), {}, {
|
|
527
|
+
shopId: shopId
|
|
528
|
+
}));
|
|
529
|
+
// 默认值触发映射
|
|
530
|
+
batchFillByMapping(_initialValues);
|
|
531
|
+
//如果有订单号 订单返填 通过订单号入口进行工单录入，需要将订单数据反填到工单
|
|
532
|
+
if (!(orderNo && shopId)) {
|
|
533
|
+
_context2.next = 59;
|
|
534
|
+
break;
|
|
548
535
|
}
|
|
549
|
-
|
|
536
|
+
queryLabels(orderNo, shopId);
|
|
537
|
+
queryMemberLevels(orderNo, shopId);
|
|
538
|
+
_context2.next = 57;
|
|
539
|
+
return orderBack({
|
|
540
|
+
order_no: orderNo,
|
|
541
|
+
form: form,
|
|
542
|
+
shopId: shopId,
|
|
543
|
+
shopList: shopList,
|
|
544
|
+
templateDetail: templateDetail,
|
|
545
|
+
callback: orderBackReplace,
|
|
546
|
+
fromQNCreateWorkOrderByOrderNo: fromQNCreateWorkOrderByOrderNo,
|
|
547
|
+
// TODO: 只有在千牛端通过订单号录入工单的时候，订单备注不需要反填
|
|
548
|
+
plat: plat,
|
|
549
|
+
callKey: 2,
|
|
550
|
+
setLoading: setLoading
|
|
551
|
+
});
|
|
552
|
+
case 57:
|
|
553
|
+
_context2.next = 60;
|
|
554
|
+
break;
|
|
555
|
+
case 59:
|
|
556
|
+
// 如果没有订单反填，则单独更新remark
|
|
557
|
+
fetchRemark(shopId, currentNodeTid);
|
|
558
|
+
case 60:
|
|
550
559
|
antFormEl = document.getElementsByClassName('ant-form');
|
|
551
560
|
(antFormEl === null || antFormEl === void 0 ? void 0 : antFormEl.length) > 0 && set(antFormEl, '0.scrollTop', 0);
|
|
552
561
|
resetMappingHideComponents();
|
|
@@ -555,7 +564,7 @@ var FormRender = function FormRender(props, ref) {
|
|
|
555
564
|
type: 'setaAutoSubmitFlag',
|
|
556
565
|
payload: true
|
|
557
566
|
});
|
|
558
|
-
case
|
|
567
|
+
case 64:
|
|
559
568
|
case "end":
|
|
560
569
|
return _context2.stop();
|
|
561
570
|
}
|
|
@@ -1170,9 +1170,9 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
1170
1170
|
if (autoSubmit && !isNull(currentNodeDetail)) {
|
|
1171
1171
|
var _currentNodeDetail$wo26, _currentNodeDetail$wo27;
|
|
1172
1172
|
// SKX首节点满足下列条件、此时批量提交会等订单数据反填再提交, 其余企业批量提交还是原先逻辑，不涉及订单数据反填
|
|
1173
|
-
if (currentNodeDetail !== null && currentNodeDetail !== void 0 && (_currentNodeDetail$wo26 = currentNodeDetail.workOrder) !== null && _currentNodeDetail$wo26 !== void 0 &&
|
|
1173
|
+
if (currentNodeDetail !== null && currentNodeDetail !== void 0 && (_currentNodeDetail$wo26 = currentNodeDetail.workOrder) !== null && _currentNodeDetail$wo26 !== void 0 && _currentNodeDetail$wo26.notAutoFillWithFirstSubmit && autoSubmitFlag) {
|
|
1174
1174
|
autoSubmitFn();
|
|
1175
|
-
} else if (!autoSubmitFlag) {
|
|
1175
|
+
} else if (!(currentNodeDetail !== null && currentNodeDetail !== void 0 && (_currentNodeDetail$wo27 = currentNodeDetail.workOrder) !== null && _currentNodeDetail$wo27 !== void 0 && _currentNodeDetail$wo27.notAutoFillWithFirstSubmit) && !autoSubmitFlag) {
|
|
1176
1176
|
autoSubmitFn();
|
|
1177
1177
|
}
|
|
1178
1178
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kmkf-fe-packages/kmkf-work-order-service-component",
|
|
3
|
-
"version": "2.2.5-beta.
|
|
3
|
+
"version": "2.2.5-beta.16",
|
|
4
4
|
"module": "dist/esm/index.js",
|
|
5
5
|
"typings": "dist/esm/index.d.ts",
|
|
6
6
|
"files": [
|
|
@@ -74,7 +74,7 @@
|
|
|
74
74
|
"publishConfig": {
|
|
75
75
|
"access": "public"
|
|
76
76
|
},
|
|
77
|
-
"gitHead": "
|
|
77
|
+
"gitHead": "5d8342d76a231a901654b4c7c4ddd699201ddb6f",
|
|
78
78
|
"gitHooks": {
|
|
79
79
|
"pre-commit": "lint-staged"
|
|
80
80
|
}
|