@kmkf-fe-packages/kmkf-work-order-service-component 2.0.15 → 2.0.17
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/common.js +1 -1
- package/dist/esm/FlowTemplateDetailV2/components/CloseModal/index.d.ts +2 -1
- package/dist/esm/FlowTemplateDetailV2/components/CloseModal/index.js +24 -10
- package/dist/esm/FlowTemplateDetailV2/components/FormRender/index.js +31 -9
- package/dist/esm/FlowTemplateDetailV2/components/RemarkListModal/index.js +6 -1
- package/dist/esm/FlowTemplateDetailV2/components/RemarkShow/index.js +6 -1
- package/dist/esm/FlowTemplateDetailV2/constant.js +1 -1
- package/dist/esm/FlowTemplateDetailV2/index.js +14 -13
- package/dist/esm/WorkOrder/components/WorkOrderList/index.js +5 -1
- package/dist/esm/common/utils/constant.js +38 -0
- package/dist/esm/common/utils/submitDataTransOldFormat.js +60 -55
- package/dist/esm/common/utils/tools.d.ts +2 -1
- package/dist/esm/common/utils/tools.js +146 -71
- package/dist/esm/common/utils/tools_constants.js +1 -2
- package/dist/esm/common/utils/transformWorkOrderData.js +114 -6
- package/dist/esm/model/flowTemplateDetail/types.d.ts +1 -0
- package/dist/esm/model/servers/api.d.ts +1 -0
- package/dist/esm/model/servers/api.js +10 -1
- package/package.json +5 -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
|
@@ -46,7 +46,7 @@ export var FLOW_STATUS_V2 = {
|
|
|
46
46
|
RETURNING: '回退中'
|
|
47
47
|
};
|
|
48
48
|
//不能回填的组件type
|
|
49
|
-
export var CANNOT_BACK_FILL = ['LOGISTICS_TRAJECTORY', 'LOGISTICS_TRAJECTORY_MORE', 'BUYER_MESSAGE_NOTICE', 'MSG_STATUS', 'NEW_PAYMENT_STATUS', 'REISSUE_STATUS', 'REISSUE_LOGISTICS', 'RETURN_GOODS_STATUS', 'RETURN_GOODS_TRADE_ID', 'ADJUST_WORK_ORDER_STATUS', 'INVOICE_STATUS', 'INVOICING_STATUS', 'EXCHANGE_STATUS', 'WAREHOUSING_STATUS', 'BS_E3_WAREHOUSING_STATUS', 'EXCHANGE_TRADE_ID', 'REISSUE_TRADE_ID', 'LOGISTICS_INTERCEPTION', 'LOGISTICS_INTERCEPTION_MORE'];
|
|
49
|
+
export var CANNOT_BACK_FILL = ['LOGISTICS_TRAJECTORY', 'LOGISTICS_TRAJECTORY_MORE', 'BUYER_MESSAGE_NOTICE', 'MSG_STATUS', 'NEW_PAYMENT_STATUS', 'REISSUE_STATUS', 'REISSUE_LOGISTICS', 'RETURN_GOODS_STATUS', 'RETURN_GOODS_TRADE_ID', 'ADJUST_WORK_ORDER_STATUS', 'INVOICE_STATUS', 'INVOICING_STATUS', 'EXCHANGE_STATUS', 'WAREHOUSING_STATUS', 'BS_E3_WAREHOUSING_STATUS', 'EXCHANGE_TRADE_ID', 'REISSUE_TRADE_ID', 'ERP_AFTER_SALE_TRADE_ID', 'LOGISTICS_INTERCEPTION', 'LOGISTICS_INTERCEPTION_MORE'];
|
|
50
50
|
export var verifyHandle = function verifyHandle(data, componentDtoList) {
|
|
51
51
|
var _componentDtoList$fin, _componentDtoList$fin2, _data$paymentUniqueKe, _data$paymentUniqueKe2;
|
|
52
52
|
var res = {
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
+
import { FormInstance } from 'antd';
|
|
2
3
|
declare type CloseModalType = {
|
|
3
|
-
handleClose: (p: any) => void;
|
|
4
|
+
handleClose: (p: any, form: FormInstance<any>) => void;
|
|
4
5
|
};
|
|
5
6
|
declare const CloseModal: ({ handleClose }: CloseModalType) => React.JSX.Element;
|
|
6
7
|
export default CloseModal;
|
|
@@ -9,7 +9,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
|
|
|
9
9
|
function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
|
|
10
10
|
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
11
11
|
import React, { useRef, useContext } from 'react';
|
|
12
|
-
import { Modal, Form, Input, message } from 'antd';
|
|
12
|
+
import { Modal, Form, Input, message, Radio } from 'antd';
|
|
13
13
|
import { ApaasUploadAsync } from '@kmkf-fe-packages/basic-components';
|
|
14
14
|
import { selectCurrentAction } from "../../store/selector";
|
|
15
15
|
import { useSelector } from "../../context/useSelector";
|
|
@@ -28,8 +28,9 @@ var CloseModal = function CloseModal(_ref) {
|
|
|
28
28
|
dispatch({
|
|
29
29
|
type: 'setAction'
|
|
30
30
|
});
|
|
31
|
-
form.resetFields();
|
|
31
|
+
// form.resetFields();
|
|
32
32
|
};
|
|
33
|
+
|
|
33
34
|
var onOK = /*#__PURE__*/function () {
|
|
34
35
|
var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
|
|
35
36
|
var _imageRef$current;
|
|
@@ -47,8 +48,11 @@ var CloseModal = function CloseModal(_ref) {
|
|
|
47
48
|
return form.validateFields();
|
|
48
49
|
case 4:
|
|
49
50
|
remark = _context.sent;
|
|
50
|
-
|
|
51
|
-
|
|
51
|
+
if (!(remark !== null && remark !== void 0 && remark.flowRefuseType)) {
|
|
52
|
+
remark.flowRefuseType = 1;
|
|
53
|
+
}
|
|
54
|
+
handleClose(remark, form);
|
|
55
|
+
// form.resetFields();
|
|
52
56
|
case 7:
|
|
53
57
|
case "end":
|
|
54
58
|
return _context.stop();
|
|
@@ -64,14 +68,24 @@ var CloseModal = function CloseModal(_ref) {
|
|
|
64
68
|
visible: action === 'close',
|
|
65
69
|
onCancel: closeModal,
|
|
66
70
|
onOk: onOK
|
|
67
|
-
}, /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(
|
|
68
|
-
style: {
|
|
69
|
-
marginBottom: '16px'
|
|
70
|
-
}
|
|
71
|
-
}, "\u786E\u5B9A\u8981\u5173\u95ED\u8BE5\u6761\u5DE5\u5355\u5417\uFF1F"), /*#__PURE__*/React.createElement(Form, {
|
|
71
|
+
}, /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Form, {
|
|
72
72
|
form: form,
|
|
73
|
-
layout: "vertical"
|
|
73
|
+
layout: "vertical",
|
|
74
|
+
initialValues: {
|
|
75
|
+
flowRefuseType: 1
|
|
76
|
+
}
|
|
74
77
|
}, /*#__PURE__*/React.createElement(Form.Item, {
|
|
78
|
+
name: "flowRefuseType",
|
|
79
|
+
label: "\u8BF7\u9009\u62E9\u5DE5\u5355\u5173\u95ED\u65B9\u5F0F?",
|
|
80
|
+
rules: [{
|
|
81
|
+
required: true,
|
|
82
|
+
message: "\u8BF7\u9009\u62E9\u5DE5\u5355\u5173\u95ED\u65B9\u5F0F"
|
|
83
|
+
}]
|
|
84
|
+
}, /*#__PURE__*/React.createElement(Radio.Group, null, /*#__PURE__*/React.createElement(Radio, {
|
|
85
|
+
value: 1
|
|
86
|
+
}, "\u5C06\u5F53\u524D\u8282\u70B9\u5DE5\u5355\u72B6\u6001\u548C\u6D41\u7A0B\u72B6\u6001\u53D8\u4E3A\u5DF2\u5173\u95ED"), /*#__PURE__*/React.createElement(Radio, {
|
|
87
|
+
value: 2
|
|
88
|
+
}, "\u5C06\u5DF2\u6D41\u8F6C\u7684\u6240\u6709\u4EBA\u5DE5\u8282\u70B9\u5DE5\u5355\u72B6\u6001\u548C\u6D41\u7A0B\u72B6\u6001\u53D8\u4E3A\u5DF2\u5173\u95ED"))), /*#__PURE__*/React.createElement(Form.Item, {
|
|
75
89
|
label: "\u5907\u6CE8",
|
|
76
90
|
name: "remark",
|
|
77
91
|
rules: [{
|
|
@@ -25,11 +25,11 @@ import React, { useState, useRef, useEffect, useMemo, forwardRef, useImperativeH
|
|
|
25
25
|
import { ConfigProvider, Form, Space, Tag } from 'antd';
|
|
26
26
|
import { useWhyDidYouUpdate } from 'ahooks';
|
|
27
27
|
import zhCN from 'antd/es/locale/zh_CN';
|
|
28
|
-
import { get, some, set, every, cloneDeep, isEmpty, intersection, throttle, groupBy, find } from 'lodash';
|
|
28
|
+
import { get, some, set, every, cloneDeep, isEmpty, intersection, throttle, groupBy, find, isArray } from 'lodash';
|
|
29
29
|
import 'moment/locale/zh-cn';
|
|
30
30
|
import { calcWorkOrderList, orderBack, getReplaceWarnValues, COMPONENT_MAP_NAME, EXCLUDE_REPLACE_TOP_COMPONENT,
|
|
31
31
|
// 重复检验不需要展示在顶部的
|
|
32
|
-
INNER_REPLACE_COMPONENT, reversalFormValues, bsSystemOrderBackValues, kmSystemOrderBackValues, bsE3SystemOrderBackValues, wlnSystemOrderBackValues, gySystemOrderBackValues, getMappingConfigByTemplateDetail, wdtSystemOrderBackValues, setLogisticsInfo, getMappingTargetValue } from "../../../common/utils/tools";
|
|
32
|
+
INNER_REPLACE_COMPONENT, reversalFormValues, bsSystemOrderBackValues, kmSystemOrderBackValues, bsE3SystemOrderBackValues, wlnSystemOrderBackValues, gySystemOrderBackValues, jstSystemOrderBackValues, getMappingConfigByTemplateDetail, wdtSystemOrderBackValues, setLogisticsInfo, getMappingTargetValue } from "../../../common/utils/tools";
|
|
33
33
|
import { replaceCheck, orderDetail, queryLabelByTradeId, queryMemberLevel } from "../../../model/servers/api";
|
|
34
34
|
import { factory } from '@kmkf-fe-packages/services-components';
|
|
35
35
|
import { getExpression, formatDisplayConfig, isNull, LabelData, setSessionStorage } from '@kmkf-fe-packages/kmkf-utils';
|
|
@@ -117,6 +117,10 @@ var FormRender = function FormRender(props, ref) {
|
|
|
117
117
|
_useState10 = _slicedToArray(_useState9, 2),
|
|
118
118
|
shopId = _useState10[0],
|
|
119
119
|
setShopId = _useState10[1];
|
|
120
|
+
var _useState11 = useState(false),
|
|
121
|
+
_useState12 = _slicedToArray(_useState11, 2),
|
|
122
|
+
isOrderBackShopId = _useState12[0],
|
|
123
|
+
setIsOrderBackShopId = _useState12[1];
|
|
120
124
|
var _Form$useForm = Form.useForm(),
|
|
121
125
|
_Form$useForm2 = _slicedToArray(_Form$useForm, 1),
|
|
122
126
|
preNodeForm = _Form$useForm2[0];
|
|
@@ -351,6 +355,10 @@ var FormRender = function FormRender(props, ref) {
|
|
|
351
355
|
orderNo = _ref2.orderNo,
|
|
352
356
|
buyerId = _ref2.buyerId,
|
|
353
357
|
buyerNick = _ref2.buyerNick;
|
|
358
|
+
if (isOrderBackShopId) {
|
|
359
|
+
setIsOrderBackShopId(false);
|
|
360
|
+
return;
|
|
361
|
+
}
|
|
354
362
|
form.resetFields();
|
|
355
363
|
//获取一些默认数据
|
|
356
364
|
var jsonMap = templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList.reduce(function (prv, next) {
|
|
@@ -504,7 +512,7 @@ var FormRender = function FormRender(props, ref) {
|
|
|
504
512
|
var resetMappingHideComponents = function resetMappingHideComponents() {
|
|
505
513
|
var hideComponents = mappingConfig.hideComponents.filter(function (key) {
|
|
506
514
|
var value = form.getFieldValue(key);
|
|
507
|
-
return _typeof(value) === 'object' ? !value.value : !value;
|
|
515
|
+
return _typeof(value) === 'object' ? isArray(value) ? !value.length : !value.value : !value;
|
|
508
516
|
});
|
|
509
517
|
if (!finallyMappingHideComponents.current) {
|
|
510
518
|
finallyMappingHideComponents.current = mappingConfig.hideComponents;
|
|
@@ -541,6 +549,7 @@ var FormRender = function FormRender(props, ref) {
|
|
|
541
549
|
return t.uniqueKey === triggerUniqueKey;
|
|
542
550
|
})) === null || _componentList$find === void 0 ? void 0 : _componentList$find.workOrderComponentType;
|
|
543
551
|
var triggerValue = getMappingTargetValue(value, workOrderComponentType);
|
|
552
|
+
|
|
544
553
|
// 如果有映射关系,则修改对应组件的值
|
|
545
554
|
var mapping = (_mappingConfig$config = mappingConfig.config) === null || _mappingConfig$config === void 0 ? void 0 : _mappingConfig$config[triggerUniqueKey];
|
|
546
555
|
if (mapping !== null && mapping !== void 0 && mapping[triggerValue]) {
|
|
@@ -557,7 +566,7 @@ var FormRender = function FormRender(props, ref) {
|
|
|
557
566
|
resetMappingHideComponents();
|
|
558
567
|
};
|
|
559
568
|
var checkFillMapping = function checkFillMapping(show, uniqueKey, workOrderComponentType) {
|
|
560
|
-
if (['RADIO', 'SELECT'].includes(workOrderComponentType)) {
|
|
569
|
+
if (['RADIO', 'SELECT', 'MULT_SELECT'].includes(workOrderComponentType)) {
|
|
561
570
|
var _formUniqueKey = templateDetail.uniqueKey;
|
|
562
571
|
if (!hideByXYComponentsMap[_formUniqueKey]) {
|
|
563
572
|
hideByXYComponentsMap[_formUniqueKey] = [];
|
|
@@ -688,7 +697,13 @@ var FormRender = function FormRender(props, ref) {
|
|
|
688
697
|
type: workOrderId ? 'edit' : 'add',
|
|
689
698
|
callback: orderBackReplace,
|
|
690
699
|
fromQNCreateWorkOrderByOrderNo: false,
|
|
691
|
-
plat: plat
|
|
700
|
+
plat: plat,
|
|
701
|
+
callbackShopId: function callbackShopId(id) {
|
|
702
|
+
setIsOrderBackShopId(true);
|
|
703
|
+
setTimeout(function () {
|
|
704
|
+
setShopId(id);
|
|
705
|
+
}, 0);
|
|
706
|
+
}
|
|
692
707
|
});
|
|
693
708
|
};
|
|
694
709
|
// 组件值变化
|
|
@@ -739,6 +754,13 @@ var FormRender = function FormRender(props, ref) {
|
|
|
739
754
|
form: form
|
|
740
755
|
});
|
|
741
756
|
}
|
|
757
|
+
if (workOrderComponentType === 'JST_SYSTEM_ORDER') {
|
|
758
|
+
jstSystemOrderBackValues({
|
|
759
|
+
templateList: templateDetail,
|
|
760
|
+
value: value,
|
|
761
|
+
form: form
|
|
762
|
+
});
|
|
763
|
+
}
|
|
742
764
|
if (activeLogisticsComponents && ['INPUT', 'EXPRESS_LOGISTICS_SELECT', 'BS_LOGISTICS'].includes(workOrderComponentType)) {
|
|
743
765
|
setLogisticsInfo({
|
|
744
766
|
logisticsMappingConfig: activeLogisticsComponents,
|
|
@@ -885,7 +907,7 @@ var FormRender = function FormRender(props, ref) {
|
|
|
885
907
|
templateDetail: templateDetail,
|
|
886
908
|
callback: orderBackReplace,
|
|
887
909
|
fromQNCreateWorkOrderByOrderNo: false,
|
|
888
|
-
|
|
910
|
+
plat: plat
|
|
889
911
|
});
|
|
890
912
|
}
|
|
891
913
|
}
|
|
@@ -975,8 +997,8 @@ var FormRender = function FormRender(props, ref) {
|
|
|
975
997
|
var _ref6 = (componentConfig === null || componentConfig === void 0 ? void 0 : componentConfig.status) || {},
|
|
976
998
|
upgrade = _ref6.upgrade,
|
|
977
999
|
created = _ref6.created;
|
|
978
|
-
if (['REISSUE_TRADE_ID', 'EXCHANGE_TRADE_ID'].includes(workOrderComponentType)) {
|
|
979
|
-
//
|
|
1000
|
+
if (['REISSUE_TRADE_ID', 'EXCHANGE_TRADE_ID', 'ERP_AFTER_SALE_TRADE_ID'].includes(workOrderComponentType)) {
|
|
1001
|
+
// 售后单id、补发单id和换货单id默认值是可见不可编辑(2)
|
|
980
1002
|
if (typeof upgrade !== 'number') {
|
|
981
1003
|
upgrade = 2;
|
|
982
1004
|
}
|
|
@@ -994,7 +1016,7 @@ var FormRender = function FormRender(props, ref) {
|
|
|
994
1016
|
if (workOrderComponentType === 'ENTERPRISE_PAYMENT') {
|
|
995
1017
|
newComponentConfig['disabled'] = disabled || !canModifyPayment;
|
|
996
1018
|
}
|
|
997
|
-
if (['RADIO', 'SELECT'].includes(workOrderComponentType)) {
|
|
1019
|
+
if (['RADIO', 'SELECT', 'MULT_SELECT'].includes(workOrderComponentType)) {
|
|
998
1020
|
var _mappingConfig$readon, _mappingConfig$readon2;
|
|
999
1021
|
if (((_mappingConfig$readon = mappingConfig.readonlyComponents[uniqueKey]) === null || _mappingConfig$readon === void 0 ? void 0 : _mappingConfig$readon.auth) === 'all') {
|
|
1000
1022
|
newComponentConfig[workOrderComponentType === 'SELECT' ? 'readonly' : 'disabled'] = true;
|
|
@@ -32,6 +32,7 @@ var Record = function Record(props) {
|
|
|
32
32
|
workOrderUpdateLog = props.workOrderUpdateLog,
|
|
33
33
|
componentDtoList = props.componentDtoList,
|
|
34
34
|
imgList = props.imgList;
|
|
35
|
+
var contextLines = context === null || context === void 0 ? void 0 : context.split('\n');
|
|
35
36
|
return /*#__PURE__*/React.createElement("div", {
|
|
36
37
|
className: styles.remarkContext
|
|
37
38
|
}, /*#__PURE__*/React.createElement("div", {
|
|
@@ -47,7 +48,11 @@ var Record = function Record(props) {
|
|
|
47
48
|
}
|
|
48
49
|
}, getFlowOperate === null || getFlowOperate === void 0 ? void 0 : getFlowOperate[operatorType]))), /*#__PURE__*/React.createElement("div", null, "\u8282\u70B9\uFF1A", nodeName), /*#__PURE__*/React.createElement("div", {
|
|
49
50
|
className: styles.context
|
|
50
|
-
}, /*#__PURE__*/React.createElement("div", null,
|
|
51
|
+
}, /*#__PURE__*/React.createElement("div", null, contextLines === null || contextLines === void 0 ? void 0 : contextLines.map(function (item, index) {
|
|
52
|
+
return /*#__PURE__*/React.createElement("span", {
|
|
53
|
+
key: index
|
|
54
|
+
}, item, /*#__PURE__*/React.createElement("br", null));
|
|
55
|
+
})), /*#__PURE__*/React.createElement("div", null, imgList === null || imgList === void 0 ? void 0 : imgList.map(function (item) {
|
|
51
56
|
return /*#__PURE__*/React.createElement(Image, {
|
|
52
57
|
width: 40,
|
|
53
58
|
height: 40,
|
|
@@ -4,6 +4,7 @@ import { imgResize } from '@kmkf-fe-packages/kmkf-utils';
|
|
|
4
4
|
import { getFlowOperate } from "../../common";
|
|
5
5
|
import styles from "./index.module.less";
|
|
6
6
|
var RemarkShow = function RemarkShow(props) {
|
|
7
|
+
var _context$split;
|
|
7
8
|
var time = props.time,
|
|
8
9
|
operator = props.operator,
|
|
9
10
|
context = props.context,
|
|
@@ -34,7 +35,11 @@ var RemarkShow = function RemarkShow(props) {
|
|
|
34
35
|
onClick: handleOpenRemarkList
|
|
35
36
|
}, "\u8BB0\u5F55"))), /*#__PURE__*/React.createElement("div", {
|
|
36
37
|
className: styles.context
|
|
37
|
-
}, /*#__PURE__*/React.createElement("
|
|
38
|
+
}, /*#__PURE__*/React.createElement("div", null, context === null || context === void 0 ? void 0 : (_context$split = context.split('\n')) === null || _context$split === void 0 ? void 0 : _context$split.map(function (item, index) {
|
|
39
|
+
return /*#__PURE__*/React.createElement("span", {
|
|
40
|
+
key: index
|
|
41
|
+
}, item, /*#__PURE__*/React.createElement("br", null));
|
|
42
|
+
})), /*#__PURE__*/React.createElement(React.Fragment, null, imgList === null || imgList === void 0 ? void 0 : imgList.map(function (item) {
|
|
38
43
|
return /*#__PURE__*/React.createElement(Image, {
|
|
39
44
|
width: 20,
|
|
40
45
|
height: 20,
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
// 切换当前店铺时,以下组件字段需要清空
|
|
2
|
-
export var NEED_CLEAR_FIELDS_WHEN_SHOP_ID_CHANGE = ['BS_E3_LOGISTICS', 'BS_E3_SEND_GOOD', 'ITEM_SELECT_THIRD', 'STATUS', 'ITEM_SELECT', 'ITEM_ID', 'ITEM_ENCODE', 'JST_LOGISTICS', 'JST_ITEM_SELECT_THIRD', 'JST_SUPPLY', 'JST_SEND_GOOD', 'BS_GOODS', 'BS_EXCHANGE_GOODS', 'BS_REISSUE_GOODS', 'BS_RETURN_GOODS', 'BS_LOGISTICS', 'BS_SEND_GOOD', 'BS_SYSTEM_ORDER', 'WLN_SYSTEM_ORDER', 'WLN_GOODS', 'WLN_LOGISTICS', 'WLN_SEND_GOOD', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WDT_SYSTEM_ORDER', 'WDT_REISSUE_GOODS', 'WDT_RETURN_GOODS', 'WDT_EXCHANGE_GOODS', 'KM_SYSTEM_ORDER', 'KM_SEND_GOOD', 'KM_LOGISTICS', 'BS_E3_SYSTEM_ORDER', 'BS_E3_REISSUE_GOODS', 'GY_SYSTEM_ORDER', 'GY_SEND_GOOD', 'GY_GOODS', 'GY_REISSUE_GOODS'];
|
|
2
|
+
export var NEED_CLEAR_FIELDS_WHEN_SHOP_ID_CHANGE = ['BS_E3_LOGISTICS', 'BS_E3_SEND_GOOD', 'ITEM_SELECT_THIRD', 'STATUS', 'ITEM_SELECT', 'ITEM_ID', 'ITEM_ENCODE', 'JST_LOGISTICS', 'JST_ITEM_SELECT_THIRD', 'JST_SUPPLY', 'JST_SEND_GOOD', 'BS_GOODS', 'BS_EXCHANGE_GOODS', 'BS_REISSUE_GOODS', 'BS_RETURN_GOODS', 'BS_LOGISTICS', 'BS_SEND_GOOD', 'BS_SYSTEM_ORDER', 'WLN_SYSTEM_ORDER', 'WLN_GOODS', 'WLN_LOGISTICS', 'WLN_SEND_GOOD', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WDT_SYSTEM_ORDER', 'WDT_REISSUE_GOODS', 'WDT_RETURN_GOODS', 'WDT_EXCHANGE_GOODS', 'KM_SYSTEM_ORDER', 'KM_SEND_GOOD', 'KM_LOGISTICS', 'BS_E3_SYSTEM_ORDER', 'JST_SYSTEM_ORDER', 'JST_GOODS', 'JST_REISSUE_GOODS', 'JST_RETURN_GOODS', 'JST_EXCHANGE_GOODS', 'BS_E3_REISSUE_GOODS', 'GY_SYSTEM_ORDER', 'GY_SEND_GOOD', 'GY_GOODS', 'GY_REISSUE_GOODS'];
|
|
@@ -684,7 +684,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
684
684
|
}();
|
|
685
685
|
// 关闭工单
|
|
686
686
|
var handleClose = /*#__PURE__*/function () {
|
|
687
|
-
var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(formData) {
|
|
687
|
+
var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(formData, form) {
|
|
688
688
|
var _currentNodeDetail$wo12, _currentNodeDetail$no5, _currentNodeDetail$wo13, _res$data8, _res$data8$failList, res, _res$data9, _res$data9$failList, _res$data9$failList$;
|
|
689
689
|
return _regeneratorRuntime().wrap(function _callee7$(_context7) {
|
|
690
690
|
while (1) switch (_context7.prev = _context7.next) {
|
|
@@ -714,19 +714,20 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
714
714
|
} else {
|
|
715
715
|
message.error((_res$data9 = res.data) === null || _res$data9 === void 0 ? void 0 : (_res$data9$failList = _res$data9.failList) === null || _res$data9$failList === void 0 ? void 0 : (_res$data9$failList$ = _res$data9$failList[0]) === null || _res$data9$failList$ === void 0 ? void 0 : _res$data9$failList$.failReason);
|
|
716
716
|
}
|
|
717
|
-
|
|
717
|
+
form === null || form === void 0 ? void 0 : form.resetFields();
|
|
718
|
+
_context7.next = 11;
|
|
718
719
|
break;
|
|
719
|
-
case
|
|
720
|
-
_context7.prev =
|
|
720
|
+
case 8:
|
|
721
|
+
_context7.prev = 8;
|
|
721
722
|
_context7.t0 = _context7["catch"](0);
|
|
722
723
|
console.log('关闭工单失败', _context7.t0);
|
|
723
|
-
case
|
|
724
|
+
case 11:
|
|
724
725
|
case "end":
|
|
725
726
|
return _context7.stop();
|
|
726
727
|
}
|
|
727
|
-
}, _callee7, null, [[0,
|
|
728
|
+
}, _callee7, null, [[0, 8]]);
|
|
728
729
|
}));
|
|
729
|
-
return function handleClose(_x4) {
|
|
730
|
+
return function handleClose(_x4, _x5) {
|
|
730
731
|
return _ref7.apply(this, arguments);
|
|
731
732
|
};
|
|
732
733
|
}();
|
|
@@ -773,7 +774,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
773
774
|
}
|
|
774
775
|
}, _callee8, null, [[0, 7]]);
|
|
775
776
|
}));
|
|
776
|
-
return function handleForWard(
|
|
777
|
+
return function handleForWard(_x6) {
|
|
777
778
|
return _ref8.apply(this, arguments);
|
|
778
779
|
};
|
|
779
780
|
}();
|
|
@@ -807,7 +808,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
807
808
|
});
|
|
808
809
|
};
|
|
809
810
|
handleTimeOut = function handleTimeOut() {
|
|
810
|
-
message.error(
|
|
811
|
+
message.error('接口响应超时');
|
|
811
812
|
dispatch({
|
|
812
813
|
type: 'setRejectLoading',
|
|
813
814
|
payload: false
|
|
@@ -863,7 +864,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
863
864
|
}
|
|
864
865
|
}, _callee9, null, [[3, 13]]);
|
|
865
866
|
}));
|
|
866
|
-
return function handleReturnWorkOrder(
|
|
867
|
+
return function handleReturnWorkOrder(_x7) {
|
|
867
868
|
return _ref9.apply(this, arguments);
|
|
868
869
|
};
|
|
869
870
|
}();
|
|
@@ -896,7 +897,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
896
897
|
});
|
|
897
898
|
};
|
|
898
899
|
handleTimeOut = function handleTimeOut() {
|
|
899
|
-
message.error(
|
|
900
|
+
message.error('接口响应超时');
|
|
900
901
|
dispatch({
|
|
901
902
|
type: 'setWithDrawLoading',
|
|
902
903
|
payload: false
|
|
@@ -953,7 +954,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
953
954
|
}
|
|
954
955
|
}, _callee10, null, [[3, 13]]);
|
|
955
956
|
}));
|
|
956
|
-
return function handleWithdraw(
|
|
957
|
+
return function handleWithdraw(_x8) {
|
|
957
958
|
return _ref10.apply(this, arguments);
|
|
958
959
|
};
|
|
959
960
|
}();
|
|
@@ -1034,7 +1035,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
1034
1035
|
}
|
|
1035
1036
|
}, _callee11, null, [[0, 12, 15, 18]]);
|
|
1036
1037
|
}));
|
|
1037
|
-
return function handleReminder(
|
|
1038
|
+
return function handleReminder(_x9) {
|
|
1038
1039
|
return _ref11.apply(this, arguments);
|
|
1039
1040
|
};
|
|
1040
1041
|
}();
|
|
@@ -156,6 +156,9 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref4) {
|
|
|
156
156
|
var companyKey = useAppSelector(function (state) {
|
|
157
157
|
return state.workOrder.userInfo.companyKey;
|
|
158
158
|
});
|
|
159
|
+
var bindERP = useAppSelector(function (state) {
|
|
160
|
+
return state.workOrder.userInfo.bindERP;
|
|
161
|
+
});
|
|
159
162
|
var platformInfo = useAppSelector(function (state) {
|
|
160
163
|
return state.global.platformInfo;
|
|
161
164
|
});
|
|
@@ -533,7 +536,8 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref4) {
|
|
|
533
536
|
platform: platform,
|
|
534
537
|
shopId: shopId,
|
|
535
538
|
userKey: userKey,
|
|
536
|
-
companyKey: companyKey
|
|
539
|
+
companyKey: companyKey,
|
|
540
|
+
bindERP: bindERP
|
|
537
541
|
},
|
|
538
542
|
callbackDealWorkOrderSuccess: onDealWorkOrderSuccess,
|
|
539
543
|
onOpenWangWang: onOpenWangWang
|
|
@@ -57,6 +57,11 @@ export var systemOrderMap = {
|
|
|
57
57
|
no: 'gySystemOrderNo',
|
|
58
58
|
ids: 'gySystemSelectIds',
|
|
59
59
|
order: 'gySystemShowOrder'
|
|
60
|
+
},
|
|
61
|
+
JST_SYSTEM_ORDER: {
|
|
62
|
+
no: 'jstSystemOrderNo',
|
|
63
|
+
ids: 'jstSystemSelectIds',
|
|
64
|
+
order: 'jstSystemShowOrder'
|
|
60
65
|
}
|
|
61
66
|
};
|
|
62
67
|
export var DEFAULT_STRING_COMPONENT_TYPE_FIELD_MAPPING = {
|
|
@@ -129,6 +134,10 @@ export var SUBMIT_COMPONENT_STATUS_MAP = {
|
|
|
129
134
|
REJECT_RETURN_GOODS_STATUS: {
|
|
130
135
|
status: 'rejectReturnGoodsStatusValue',
|
|
131
136
|
reason: 'rejectReturnGoodsStatusReason'
|
|
137
|
+
},
|
|
138
|
+
ERP_AFTER_SALE_STATUS: {
|
|
139
|
+
status: 'erpAfterSaleStatusValue',
|
|
140
|
+
reason: 'erpAfterSaleStatusReason'
|
|
132
141
|
}
|
|
133
142
|
};
|
|
134
143
|
export var SUBMIT_COMPONENT_GOOD_STATUS_MAP = {
|
|
@@ -173,6 +182,11 @@ export var SUBMIT_COMPONENT_ERP_LOGISTICS_MAP = {
|
|
|
173
182
|
list: 'kmLogisticsList',
|
|
174
183
|
company: 'kmLogisticsCompany',
|
|
175
184
|
code: 'kmLogisticsCode'
|
|
185
|
+
},
|
|
186
|
+
JST_LOGISTICS: {
|
|
187
|
+
list: 'jstItemList',
|
|
188
|
+
company: 'logisticsCompany',
|
|
189
|
+
code: 'logisticsCode'
|
|
176
190
|
}
|
|
177
191
|
};
|
|
178
192
|
export var SUBMIT_COMPONENT_SEND_GOOD_MAP = {
|
|
@@ -208,6 +222,10 @@ export var SUBMIT_COMPONENT_GOODS_MAP = {
|
|
|
208
222
|
GY_GOODS: {
|
|
209
223
|
type: 'gyGoods',
|
|
210
224
|
shopCode: 'shopCode'
|
|
225
|
+
},
|
|
226
|
+
JST_GOODS: {
|
|
227
|
+
type: 'jstGoods',
|
|
228
|
+
shopCode: 'shopCode'
|
|
211
229
|
}
|
|
212
230
|
};
|
|
213
231
|
export var SUBMIT_COMPONENT_REISSUE_MAP = {
|
|
@@ -228,6 +246,20 @@ export var SUBMIT_COMPONENT_REISSUE_MAP = {
|
|
|
228
246
|
shopCode: 'shopCode',
|
|
229
247
|
vipCode: 'vipCode',
|
|
230
248
|
systemOrderNo: 'gySystemOrderNo'
|
|
249
|
+
},
|
|
250
|
+
JST_REISSUE_GOODS: {
|
|
251
|
+
type: 'jstReissueType',
|
|
252
|
+
goods: 'jstReissueGoods',
|
|
253
|
+
shopCode: 'shopCode',
|
|
254
|
+
systemOrderNo: 'jstSystemOrderNo',
|
|
255
|
+
systemOrderBillType: 'jstSystemOrderBillType'
|
|
256
|
+
},
|
|
257
|
+
JST_RETURN_GOODS: {
|
|
258
|
+
type: 'jstReturnType',
|
|
259
|
+
goods: 'jstReturnGoods',
|
|
260
|
+
shopCode: 'shopCode',
|
|
261
|
+
systemOrderNo: 'jstSystemOrderNo',
|
|
262
|
+
systemOrderBillType: 'jstSystemOrderBillType'
|
|
231
263
|
}
|
|
232
264
|
};
|
|
233
265
|
export var SUBMIT_COMPONENT_RETURN_GOODS_MAP = {
|
|
@@ -278,5 +310,11 @@ export var SUBMIT_COMPONENT_SYSTEM_ORDER_MAP = {
|
|
|
278
310
|
ids: 'gySystemSelectIds',
|
|
279
311
|
order: 'gySystemShowOrder',
|
|
280
312
|
select: 'billNo'
|
|
313
|
+
},
|
|
314
|
+
JST_SYSTEM_ORDER: {
|
|
315
|
+
no: 'jstSystemOrderNo',
|
|
316
|
+
ids: 'jstSystemSelectIds',
|
|
317
|
+
order: 'jstSystemShowOrder',
|
|
318
|
+
select: 'oId'
|
|
281
319
|
}
|
|
282
320
|
};
|