@kmkf-fe-packages/kmkf-work-order-service-component 2.0.12-beta.4 → 2.0.12-beta.40
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/CurrentNode/index.d.ts +1 -0
- package/dist/esm/FlowTemplateDetailV2/components/CurrentNode/index.js +3 -1
- package/dist/esm/FlowTemplateDetailV2/components/FormRender/index.d.ts +1 -0
- package/dist/esm/FlowTemplateDetailV2/components/FormRender/index.js +23 -6
- package/dist/esm/FlowTemplateDetailV2/components/Item/index.d.ts +1 -0
- package/dist/esm/FlowTemplateDetailV2/components/Item/index.js +3 -1
- 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 +16 -13
- package/dist/esm/WorkOrder/components/WorkOrderList/index.js +5 -1
- package/dist/esm/common/utils/constant.js +21 -2
- package/dist/esm/common/utils/submitDataTransOldFormat.js +146 -97
- package/dist/esm/common/utils/tools.d.ts +1 -1
- package/dist/esm/common/utils/tools.js +65 -34
- package/dist/esm/common/utils/tools_constants.js +39 -5
- package/dist/esm/common/utils/transformWorkOrderData.js +65 -9
- package/dist/esm/model/flowTemplateDetail/types.d.ts +1 -0
- package/dist/esm/model/servers/api.d.ts +2 -0
- package/dist/esm/model/servers/api.js +19 -0
- 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', '
|
|
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', 'ORDER_TYPE'];
|
|
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: [{
|
|
@@ -7,6 +7,7 @@ declare type CurrentNodeProps = {
|
|
|
7
7
|
readonly?: boolean;
|
|
8
8
|
onOpenWangWang?: (nick: string, id: string) => void;
|
|
9
9
|
onUpdateRemark?: (remark: string, flag: string) => void;
|
|
10
|
+
onJumpPage?: (val: any) => void;
|
|
10
11
|
onReminder?: (type: string) => void;
|
|
11
12
|
flowTemplateId: string;
|
|
12
13
|
flowWorkOrderId?: string;
|
|
@@ -64,7 +64,8 @@ var CurrentNode = function CurrentNode(props, ref) {
|
|
|
64
64
|
flowTemplateId = props.flowTemplateId,
|
|
65
65
|
flowWorkOrderId = props.flowWorkOrderId,
|
|
66
66
|
queryRemarkList = props.queryRemarkList,
|
|
67
|
-
autoSubmit = props.autoSubmit
|
|
67
|
+
autoSubmit = props.autoSubmit,
|
|
68
|
+
onJumpPage = props.onJumpPage;
|
|
68
69
|
var _useContext = useContext(Context),
|
|
69
70
|
dispatch = _useContext.dispatch;
|
|
70
71
|
// 是否是编辑状态
|
|
@@ -315,6 +316,7 @@ var CurrentNode = function CurrentNode(props, ref) {
|
|
|
315
316
|
shopId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo22 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo22 === void 0 ? void 0 : _currentNodeDetail$wo22.shopId) || plat.shopId || defaultShopId,
|
|
316
317
|
accountName: plat === null || plat === void 0 ? void 0 : plat.accountName,
|
|
317
318
|
onOpenWangWang: onOpenWangWang,
|
|
319
|
+
onJumpPage: onJumpPage,
|
|
318
320
|
onUpdateRemark: onUpdateRemark,
|
|
319
321
|
currentNodeTid: currentNodeTid,
|
|
320
322
|
form: form,
|
|
@@ -24,6 +24,7 @@ declare type FormRenderProps = {
|
|
|
24
24
|
form: FormInstance;
|
|
25
25
|
currentNodeTid: string;
|
|
26
26
|
onOpenWangWang?: (nick: string, id: string) => void;
|
|
27
|
+
onJumpPage?: (val: any) => void;
|
|
27
28
|
onUpdateRemark?: (remark: string, flag: string) => void;
|
|
28
29
|
handleChangeTradeId?: (p: string) => void;
|
|
29
30
|
canModifyPayment?: boolean;
|
|
@@ -72,7 +72,8 @@ var FormRender = function FormRender(props, ref) {
|
|
|
72
72
|
_props$isErpUse = props.isErpUse,
|
|
73
73
|
isErpUse = _props$isErpUse === void 0 ? false : _props$isErpUse,
|
|
74
74
|
_props$autoSubmit = props.autoSubmit,
|
|
75
|
-
autoSubmit = _props$autoSubmit === void 0 ? false : _props$autoSubmit
|
|
75
|
+
autoSubmit = _props$autoSubmit === void 0 ? false : _props$autoSubmit,
|
|
76
|
+
onJumpPage = props.onJumpPage;
|
|
76
77
|
var shopIdToUniqueKeyMap = useMemo(function () {
|
|
77
78
|
var json = {};
|
|
78
79
|
shopList.forEach(function (shop) {
|
|
@@ -117,6 +118,10 @@ var FormRender = function FormRender(props, ref) {
|
|
|
117
118
|
_useState10 = _slicedToArray(_useState9, 2),
|
|
118
119
|
shopId = _useState10[0],
|
|
119
120
|
setShopId = _useState10[1];
|
|
121
|
+
var _useState11 = useState(false),
|
|
122
|
+
_useState12 = _slicedToArray(_useState11, 2),
|
|
123
|
+
isOrderBackShopId = _useState12[0],
|
|
124
|
+
setIsOrderBackShopId = _useState12[1];
|
|
120
125
|
var _Form$useForm = Form.useForm(),
|
|
121
126
|
_Form$useForm2 = _slicedToArray(_Form$useForm, 1),
|
|
122
127
|
preNodeForm = _Form$useForm2[0];
|
|
@@ -351,6 +356,10 @@ var FormRender = function FormRender(props, ref) {
|
|
|
351
356
|
orderNo = _ref2.orderNo,
|
|
352
357
|
buyerId = _ref2.buyerId,
|
|
353
358
|
buyerNick = _ref2.buyerNick;
|
|
359
|
+
if (isOrderBackShopId) {
|
|
360
|
+
setIsOrderBackShopId(false);
|
|
361
|
+
return;
|
|
362
|
+
}
|
|
354
363
|
form.resetFields();
|
|
355
364
|
//获取一些默认数据
|
|
356
365
|
var jsonMap = templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList.reduce(function (prv, next) {
|
|
@@ -689,7 +698,13 @@ var FormRender = function FormRender(props, ref) {
|
|
|
689
698
|
type: workOrderId ? 'edit' : 'add',
|
|
690
699
|
callback: orderBackReplace,
|
|
691
700
|
fromQNCreateWorkOrderByOrderNo: false,
|
|
692
|
-
plat: plat
|
|
701
|
+
plat: plat,
|
|
702
|
+
callbackShopId: function callbackShopId(id) {
|
|
703
|
+
setIsOrderBackShopId(true);
|
|
704
|
+
setTimeout(function () {
|
|
705
|
+
setShopId(id);
|
|
706
|
+
}, 0);
|
|
707
|
+
}
|
|
693
708
|
});
|
|
694
709
|
};
|
|
695
710
|
// 组件值变化
|
|
@@ -893,7 +908,7 @@ var FormRender = function FormRender(props, ref) {
|
|
|
893
908
|
templateDetail: templateDetail,
|
|
894
909
|
callback: orderBackReplace,
|
|
895
910
|
fromQNCreateWorkOrderByOrderNo: false,
|
|
896
|
-
|
|
911
|
+
plat: plat
|
|
897
912
|
});
|
|
898
913
|
}
|
|
899
914
|
}
|
|
@@ -983,7 +998,7 @@ var FormRender = function FormRender(props, ref) {
|
|
|
983
998
|
var _ref6 = (componentConfig === null || componentConfig === void 0 ? void 0 : componentConfig.status) || {},
|
|
984
999
|
upgrade = _ref6.upgrade,
|
|
985
1000
|
created = _ref6.created;
|
|
986
|
-
if (['REISSUE_TRADE_ID', 'EXCHANGE_TRADE_ID', '
|
|
1001
|
+
if (['REISSUE_TRADE_ID', 'EXCHANGE_TRADE_ID', 'ERP_AFTER_SALE_TRADE_ID'].includes(workOrderComponentType)) {
|
|
987
1002
|
// 售后单id、补发单id和换货单id默认值是可见不可编辑(2)
|
|
988
1003
|
if (typeof upgrade !== 'number') {
|
|
989
1004
|
upgrade = 2;
|
|
@@ -1106,7 +1121,8 @@ var FormRender = function FormRender(props, ref) {
|
|
|
1106
1121
|
templateDetail: templateDetail,
|
|
1107
1122
|
disabled: look,
|
|
1108
1123
|
displayConfig: get(templateDetail, 'flowTemplateConfig.showHideRule.rules', []),
|
|
1109
|
-
isPreRender: false
|
|
1124
|
+
isPreRender: false,
|
|
1125
|
+
onJumpPage: onJumpPage
|
|
1110
1126
|
}));
|
|
1111
1127
|
// TODO: 这里只是为了把前置组件的值能够set到当前form表单中去
|
|
1112
1128
|
// TODO: 为什么不直接把前置和当前放在同一个form里面呢?因为放在同一个里面会有必填校验等逻辑,前置节点在当前表单中只是做展示,但是还必须有控制显隐功能
|
|
@@ -1222,7 +1238,8 @@ var FormRender = function FormRender(props, ref) {
|
|
|
1222
1238
|
templateDetail: templateDetail,
|
|
1223
1239
|
disabled: true,
|
|
1224
1240
|
displayConfig: finalDisplayConfig,
|
|
1225
|
-
isPreRender: true
|
|
1241
|
+
isPreRender: true,
|
|
1242
|
+
onJumpPage: onJumpPage
|
|
1226
1243
|
})(t);
|
|
1227
1244
|
});
|
|
1228
1245
|
});
|
|
@@ -51,7 +51,8 @@ var NodeItem = function NodeItem(props) {
|
|
|
51
51
|
_props$visibleType = props.visibleType,
|
|
52
52
|
visibleType = _props$visibleType === void 0 ? '' : _props$visibleType,
|
|
53
53
|
nodeIsAuto = props.nodeIsAuto,
|
|
54
|
-
flowTemplateKey = props.flowTemplateKey
|
|
54
|
+
flowTemplateKey = props.flowTemplateKey,
|
|
55
|
+
onJumpPage = props.onJumpPage;
|
|
55
56
|
var _useContext = useContext(Context),
|
|
56
57
|
dispatch = _useContext.dispatch;
|
|
57
58
|
var plat = useSelector(selectPlatInfo);
|
|
@@ -290,6 +291,7 @@ var NodeItem = function NodeItem(props) {
|
|
|
290
291
|
accountName: plat.accountName,
|
|
291
292
|
form: form,
|
|
292
293
|
onOpenWangWang: onOpenWangWang,
|
|
294
|
+
onJumpPage: onJumpPage,
|
|
293
295
|
look: !editing || flowStatus === FlowStatus.STOPPING,
|
|
294
296
|
shopId: data === null || data === void 0 ? void 0 : (_data$data18 = data.data) === null || _data$data18 === void 0 ? void 0 : (_data$data18$workOrde = _data$data18.workOrder) === null || _data$data18$workOrde === void 0 ? void 0 : _data$data18$workOrde.shopId,
|
|
295
297
|
formProps: {
|
|
@@ -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', 'JST_SYSTEM_ORDER', 'JST_GOODS', 'JST_REISSUE_GOODS', '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', 'GY_RETURN_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
|
}();
|
|
@@ -1258,6 +1259,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
1258
1259
|
nodeName: flowRecord.nodeName,
|
|
1259
1260
|
shopList: shopList,
|
|
1260
1261
|
onOpenWangWang: onOpenWangWang,
|
|
1262
|
+
onJumpPage: onJumpPage,
|
|
1261
1263
|
queryRemarkList: queryRemarkList,
|
|
1262
1264
|
handler: flowRecord.operator,
|
|
1263
1265
|
canWithdraw: canWithdraw,
|
|
@@ -1278,6 +1280,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
1278
1280
|
readonly: readonly,
|
|
1279
1281
|
onOpenWangWang: onOpenWangWang,
|
|
1280
1282
|
onUpdateRemark: onUpdateRemark,
|
|
1283
|
+
onJumpPage: onJumpPage,
|
|
1281
1284
|
onReminder: handleReminder,
|
|
1282
1285
|
queryRemarkList: queryRemarkList,
|
|
1283
1286
|
autoSubmit: autoSubmit
|
|
@@ -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
|
|
@@ -88,7 +88,7 @@ export var DEFAULT_STRING_COMPONENT_TYPE_FIELD_MAPPING = {
|
|
|
88
88
|
BUSINESS_ORDER_NO: 'businessOrderNo',
|
|
89
89
|
PAYMENT_VOUCHER_CODE: 'paymentVoucherCode',
|
|
90
90
|
BASIC_MULT_SELECT: 'basicMultSelect',
|
|
91
|
-
ORDER_TYPE: '
|
|
91
|
+
ORDER_TYPE: 'erpOrderType'
|
|
92
92
|
};
|
|
93
93
|
export var DEFAULT_ARRAY_COMPONENT_TYPE_FIELD_MAPPING = {
|
|
94
94
|
RATE: 'rate',
|
|
@@ -183,6 +183,11 @@ export var SUBMIT_COMPONENT_ERP_LOGISTICS_MAP = {
|
|
|
183
183
|
list: 'kmLogisticsList',
|
|
184
184
|
company: 'kmLogisticsCompany',
|
|
185
185
|
code: 'kmLogisticsCode'
|
|
186
|
+
},
|
|
187
|
+
JST_LOGISTICS: {
|
|
188
|
+
list: 'jstItemList',
|
|
189
|
+
company: 'logisticsCompany',
|
|
190
|
+
code: 'logisticsCode'
|
|
186
191
|
}
|
|
187
192
|
};
|
|
188
193
|
export var SUBMIT_COMPONENT_SEND_GOOD_MAP = {
|
|
@@ -247,7 +252,15 @@ export var SUBMIT_COMPONENT_REISSUE_MAP = {
|
|
|
247
252
|
type: 'jstReissueType',
|
|
248
253
|
goods: 'jstReissueGoods',
|
|
249
254
|
shopCode: 'shopCode',
|
|
250
|
-
systemOrderNo: 'jstSystemOrderNo'
|
|
255
|
+
systemOrderNo: 'jstSystemOrderNo',
|
|
256
|
+
systemOrderBillType: 'jstSystemOrderBillType'
|
|
257
|
+
},
|
|
258
|
+
JST_RETURN_GOODS: {
|
|
259
|
+
type: 'jstReturnType',
|
|
260
|
+
goods: 'jstReturnGoods',
|
|
261
|
+
shopCode: 'shopCode',
|
|
262
|
+
systemOrderNo: 'jstSystemOrderNo',
|
|
263
|
+
systemOrderBillType: 'jstSystemOrderBillType'
|
|
251
264
|
}
|
|
252
265
|
};
|
|
253
266
|
export var SUBMIT_COMPONENT_RETURN_GOODS_MAP = {
|
|
@@ -260,6 +273,12 @@ export var SUBMIT_COMPONENT_RETURN_GOODS_MAP = {
|
|
|
260
273
|
returnTypeKey: 'wdtReturnType',
|
|
261
274
|
returnGoodsKey: 'wdtReturnGoods',
|
|
262
275
|
shopCodeKey: 'shopCode'
|
|
276
|
+
},
|
|
277
|
+
GY_RETURN_GOODS: {
|
|
278
|
+
returnTypeKey: 'gyReturnType',
|
|
279
|
+
returnGoodsKey: 'gyReturnGoods',
|
|
280
|
+
gySystemOrderNoKey: 'gySystemOrderNo',
|
|
281
|
+
shopCodeKey: 'shopCode'
|
|
263
282
|
}
|
|
264
283
|
};
|
|
265
284
|
export var SUBMIT_COMPONENT_SYSTEM_ORDER_MAP = {
|