@kmkf-fe-packages/kmkf-work-order-service-component 2.10.9-beta.76 → 2.10.9-beta.78
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/ActionList/index.js +14 -5
- package/dist/esm/FlowTemplateDetailV2/constant.js +1 -1
- package/dist/esm/GlobalContext/hook/dist/useGetHasErpData.js +52 -0
- package/dist/esm/GlobalContext/orderQuery/dist/useGetErpAddressData.js +180 -0
- package/dist/esm/GlobalContext/orderQuery/dist/useGetErpLogisticsCompany.js +186 -0
- package/dist/esm/WorkOrder/components/PaymentWorkOrderList/index.js +9 -4
- package/dist/esm/WorkOrder/components/WorkOrderList/index.js +5 -2
- package/dist/esm/common/utils/constant.js +15 -0
- package/dist/esm/common/utils/dist/submitDataTransOldFormat.js +899 -0
- package/dist/esm/common/utils/dist/tools.js +1326 -0
- package/dist/esm/common/utils/dist/transformWorkOrderData.js +965 -0
- package/dist/esm/common/utils/submitDataTransOldFormat.js +2 -0
- package/dist/esm/common/utils/tools.js +4 -0
- package/dist/esm/common/utils/transformWorkOrderData.js +19 -6
- package/dist/esm/model/customizeWorkOrder/dist/api.js +48 -0
- package/dist/esm/model/customizeWorkOrder/dist/index.js +370 -0
- package/dist/esm/model/customizeWorkOrder/dist/selector.js +63 -0
- package/dist/esm/model/customizeWorkOrder/dist/types.js +3 -0
- package/dist/esm/model/dist/global.js +44 -0
- package/dist/esm/model/dist/hooks.js +15 -0
- package/dist/esm/model/dist/login.js +245 -0
- package/dist/esm/model/dist/store.js +30 -0
- package/dist/esm/model/dist/userData.js +41 -0
- package/dist/esm/model/dist/workOrder.js +329 -0
- package/dist/esm/model/flowTemplateDetail/dist/api.js +192 -0
- package/dist/esm/model/flowTemplateDetail/dist/types.js +48 -0
- package/dist/esm/model/logicFlow/dist/api.js +14 -0
- package/dist/esm/model/logicFlow/dist/index.js +235 -0
- package/dist/esm/model/logicFlow/dist/selector.js +18 -0
- package/dist/esm/model/logicFlow/dist/types.js +3 -0
- package/dist/esm/model/logicFlow/selector.d.ts +3 -3
- package/dist/esm/model/paymentWorkOrder/dist/index.js +77 -0
- package/dist/esm/model/paymentWorkOrder/dist/selector.js +36 -0
- package/dist/esm/model/paymentWorkOrder/dist/types.js +3 -0
- package/dist/esm/model/paymentWorkOrder/selector.d.ts +0 -9
- package/dist/esm/model/servers/dist/api.js +545 -0
- package/dist/esm/model/servers/dist/request.js +63 -0
- package/dist/esm/model/singleShopWorkOrder/dist/index.js +216 -0
- package/dist/esm/model/singleShopWorkOrder/dist/selector.js +24 -0
- package/dist/esm/model/singleShopWorkOrder/dist/types.js +3 -0
- package/dist/esm/model/singleShopWorkOrder/selector.d.ts +0 -5
- package/dist/esm/model/types/dist/login.js +3 -0
- package/dist/esm/model/types/dist/singleWorkOrder.js +3 -0
- package/dist/esm/model/types/dist/workOrder.js +3 -0
- package/dist/esm/model/workOrder.js +3 -3
- package/package.json +5 -5
|
@@ -74,7 +74,6 @@ var buttonMap = function buttonMap(flowType) {
|
|
|
74
74
|
};
|
|
75
75
|
};
|
|
76
76
|
var ActionList = function ActionList(props) {
|
|
77
|
-
var _ref;
|
|
78
77
|
var _props$flowStatus = props.flowStatus,
|
|
79
78
|
flowStatus = _props$flowStatus === void 0 ? FlowStatus.NON_START : _props$flowStatus,
|
|
80
79
|
hasPreNode = props.hasPreNode,
|
|
@@ -85,6 +84,7 @@ var ActionList = function ActionList(props) {
|
|
|
85
84
|
privilege = _props$privilege === void 0 ? '' : _props$privilege,
|
|
86
85
|
_props$showShareButto = props.showShareButton,
|
|
87
86
|
showShareButton = _props$showShareButto === void 0 ? false : _props$showShareButto;
|
|
87
|
+
var isSinglePageInitialEntry = flowType === FlowType.SINGLE_PAGE && flowStatus === FlowStatus.NON_START;
|
|
88
88
|
var buttonList = useMemo(function () {
|
|
89
89
|
var button = getActionMap(flowStatus, hasPreNode, flowType);
|
|
90
90
|
//如果是没有按钮权限 || 分享过来的 则不显示分享按钮
|
|
@@ -97,11 +97,20 @@ var ActionList = function ActionList(props) {
|
|
|
97
97
|
if (privilege === 'created') {
|
|
98
98
|
return ['submit'];
|
|
99
99
|
}
|
|
100
|
+
if (isSinglePageInitialEntry) {
|
|
101
|
+
return button.filter(function (item) {
|
|
102
|
+
return ['submit', 'save'].includes(item);
|
|
103
|
+
});
|
|
104
|
+
}
|
|
100
105
|
return button;
|
|
101
|
-
}, [flowStatus, hasPreNode, flowType, privilege, showShareButton]);
|
|
106
|
+
}, [flowStatus, hasPreNode, flowType, privilege, showShareButton, isSinglePageInitialEntry]);
|
|
102
107
|
var sliceLen = useMemo(function () {
|
|
108
|
+
if (isSinglePageInitialEntry) {
|
|
109
|
+
return 2;
|
|
110
|
+
}
|
|
103
111
|
return flowType === FlowType.SINGLE_PAGE ? 1 : 3;
|
|
104
|
-
}, [flowType]);
|
|
112
|
+
}, [flowType, isSinglePageInitialEntry]);
|
|
113
|
+
var visibleButtonList = isSinglePageInitialEntry ? buttonList.slice(0, sliceLen) : reverse(buttonList.slice(0, sliceLen));
|
|
105
114
|
var menu = function menu(list) {
|
|
106
115
|
var items = list.map(function (item, index) {
|
|
107
116
|
return {
|
|
@@ -128,11 +137,11 @@ var ActionList = function ActionList(props) {
|
|
|
128
137
|
onClick: function onClick(e) {
|
|
129
138
|
return e.preventDefault();
|
|
130
139
|
}
|
|
131
|
-
}, /*#__PURE__*/React.createElement(Space, null, "\u66F4\u591A", /*#__PURE__*/React.createElement(DownOutlined, null)))),
|
|
140
|
+
}, /*#__PURE__*/React.createElement(Space, null, "\u66F4\u591A", /*#__PURE__*/React.createElement(DownOutlined, null)))), visibleButtonList.map(function (button, index) {
|
|
132
141
|
var _buttonMap$button, _buttonMap$button2, _buttonMap$button3, _buttonMap$button4;
|
|
133
142
|
return /*#__PURE__*/React.createElement(Button, {
|
|
134
143
|
key: "button".concat(index),
|
|
135
|
-
type: buttonMap(flowType)[button].type,
|
|
144
|
+
type: isSinglePageInitialEntry && button === 'save' ? 'default' : buttonMap(flowType)[button].type,
|
|
136
145
|
onClick: function onClick() {
|
|
137
146
|
return handleAction(button);
|
|
138
147
|
},
|
|
@@ -7,4 +7,4 @@
|
|
|
7
7
|
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
|
|
8
8
|
*/
|
|
9
9
|
// 切换当前店铺时,以下组件字段需要清空
|
|
10
|
-
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_SHOP', 'WDT_EXCHANGE_GOODS', 'KM_EXCHANGE_GOODS', 'KM_SYSTEM_ORDER', 'KM_SEND_GOOD', 'KM_RETURN_WAREHOUSE', 'KM_LOGISTICS', 'KM_GOODS', 'KM_REISSUE_GOODS', 'KM_RETURN_GOODS', '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', 'GY_LOGISTICS', 'JY_SYSTEM_ORDER', 'JY_SEND_GOOD', 'JY_GOODS', 'JY_REISSUE_GOODS', 'JY_RETURN_GOODS', 'JY_LOGISTICS', 'JKY_SYSTEM_ORDER', 'JKY_SEND_GOOD', 'JKY_GOODS', 'JKY_REISSUE_GOODS', 'WLN_REISSUE_GOODS', 'JKY_RETURN_GOODS', 'JKY_LOGISTICS', 'SKX_OUTBOUND_NOTICE_NO', 'SKX_RETURN_BILL_NO', 'SKX_REFUND_BILL_NO', 'SKX_SHOP_NAME', 'SKX_WAREHOUSE', 'SKX_LOGISTICS', 'SKX_RETURN_LOGISTICS', 'SKX_GOODS', 'SKX_RETURN_GOODS', 'SKX_ORDER_TYPE', 'SKX_RETURN_ORDER_STATUS', 'SKX_ORDER_STATUS', 'SKX_CREATE_TIME', 'DXD_SYSTEM_ORDER', 'TTX_SYSTEM_ORDER', 'DXD_LOGISTICS', 'TTX_LOGISTICS', 'DXD_SEND_GOOD', 'TTX_SEND_GOOD', 'DXD_GOODS', 'TTX_GOODS', 'DXD_SUPPLIERS'];
|
|
10
|
+
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_SHOP', 'WDT_EXCHANGE_GOODS', 'KM_EXCHANGE_GOODS', 'KM_SYSTEM_ORDER', 'KM_AFTER_SALES_ORDER', 'KM_SEND_GOOD', 'KM_RETURN_WAREHOUSE', 'KM_LOGISTICS', 'KM_GOODS', 'KM_AFTERSALE_GOODS', 'KM_REISSUE_GOODS', 'KM_RETURN_GOODS', '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', 'GY_LOGISTICS', 'JY_SYSTEM_ORDER', 'JY_SEND_GOOD', 'JY_GOODS', 'JY_REISSUE_GOODS', 'JY_RETURN_GOODS', 'JY_LOGISTICS', 'JKY_SYSTEM_ORDER', 'JKY_SEND_GOOD', 'JKY_GOODS', 'JKY_REISSUE_GOODS', 'WLN_REISSUE_GOODS', 'JKY_RETURN_GOODS', 'JKY_LOGISTICS', 'SKX_OUTBOUND_NOTICE_NO', 'SKX_RETURN_BILL_NO', 'SKX_REFUND_BILL_NO', 'SKX_SHOP_NAME', 'SKX_WAREHOUSE', 'SKX_LOGISTICS', 'SKX_RETURN_LOGISTICS', 'SKX_GOODS', 'SKX_RETURN_GOODS', 'SKX_ORDER_TYPE', 'SKX_RETURN_ORDER_STATUS', 'SKX_ORDER_STATUS', 'SKX_CREATE_TIME', 'DXD_SYSTEM_ORDER', 'TTX_SYSTEM_ORDER', 'DXD_LOGISTICS', 'TTX_LOGISTICS', 'DXD_SEND_GOOD', 'TTX_SEND_GOOD', 'DXD_GOODS', 'TTX_GOODS', 'DXD_SUPPLIERS'];
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
|
|
3
|
+
exports.__esModule = true;
|
|
4
|
+
var react_1 = require('react');
|
|
5
|
+
var react_redux_1 = require('react-redux');
|
|
6
|
+
var toolkit_1 = require('@reduxjs/toolkit');
|
|
7
|
+
var getTemplate = function getTemplate(companyUserConfig) {
|
|
8
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
|
|
9
|
+
return JSON.stringify({
|
|
10
|
+
hasWln: (_c = (_b = (_a = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : companyUserConfig.plugins) === null || _a === void 0 ? void 0 : _a.wln) === null || _b === void 0 ? void 0 : _b.show) !== null && _c !== void 0 ? _c : false,
|
|
11
|
+
hasWdt: (_f = (_e = (_d = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : companyUserConfig.plugins) === null || _d === void 0 ? void 0 : _d.wdt) === null || _e === void 0 ? void 0 : _e.show) !== null && _f !== void 0 ? _f : false,
|
|
12
|
+
hasBs: (_j = (_h = (_g = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : companyUserConfig.plugins) === null || _g === void 0 ? void 0 : _g.bs) === null || _h === void 0 ? void 0 : _h.show) !== null && _j !== void 0 ? _j : false,
|
|
13
|
+
hasE3: (_m = (_l = (_k = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : companyUserConfig.plugins) === null || _k === void 0 ? void 0 : _k.bse3) === null || _l === void 0 ? void 0 : _l.show) !== null && _m !== void 0 ? _m : false,
|
|
14
|
+
hasJst: (_q = (_p = (_o = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : companyUserConfig.plugins) === null || _o === void 0 ? void 0 : _o.jst) === null || _p === void 0 ? void 0 : _p.show) !== null && _q !== void 0 ? _q : false,
|
|
15
|
+
hasGy: (_t = (_s = (_r = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : companyUserConfig.plugins) === null || _r === void 0 ? void 0 : _r.gy) === null || _s === void 0 ? void 0 : _s.show) !== null && _t !== void 0 ? _t : false
|
|
16
|
+
});
|
|
17
|
+
};
|
|
18
|
+
function useGetHasErpData() {
|
|
19
|
+
var companyUserConfig = react_redux_1.useSelector(toolkit_1.createSelector([function (state) {
|
|
20
|
+
var _a, _b, _c, _d;
|
|
21
|
+
console.log('state--useSelector', state);
|
|
22
|
+
/**
|
|
23
|
+
* pc main
|
|
24
|
+
* 端 workOrder
|
|
25
|
+
* **/
|
|
26
|
+
return (_d = (_b = (_a = state === null || state === void 0 ? void 0 : state.main) === null || _a === void 0 ? void 0 : _a.userInfo) !== null && _b !== void 0 ? _b : (_c = state === null || state === void 0 ? void 0 : state.workOrder) === null || _c === void 0 ? void 0 : _c.userInfo) !== null && _d !== void 0 ? _d : {};
|
|
27
|
+
}], function (state) {
|
|
28
|
+
var _a;
|
|
29
|
+
var companyUserConfig = (_a = state === null || state === void 0 ? void 0 : state.companyUserConfig) !== null && _a !== void 0 ? _a : {};
|
|
30
|
+
if (typeof companyUserConfig === 'string') {
|
|
31
|
+
try {
|
|
32
|
+
companyUserConfig = JSON.parse(companyUserConfig);
|
|
33
|
+
} catch (e) {
|
|
34
|
+
console.error('companyUserConfig转换异常', companyUserConfig);
|
|
35
|
+
companyUserConfig = {};
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
return companyUserConfig;
|
|
39
|
+
}));
|
|
40
|
+
var _a = react_1.useState(getTemplate({})),
|
|
41
|
+
hasErpDataJson = _a[0],
|
|
42
|
+
setHasErpDataJson = _a[1];
|
|
43
|
+
react_1.useEffect(function () {
|
|
44
|
+
setHasErpDataJson(getTemplate(companyUserConfig));
|
|
45
|
+
console.log('companyUserConfig---', companyUserConfig);
|
|
46
|
+
}, [companyUserConfig]);
|
|
47
|
+
var hasErpData = react_1.useMemo(function () {
|
|
48
|
+
return JSON.parse(hasErpDataJson);
|
|
49
|
+
}, [hasErpDataJson]);
|
|
50
|
+
return hasErpData;
|
|
51
|
+
}
|
|
52
|
+
exports['default'] = useGetHasErpData;
|
|
@@ -0,0 +1,180 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
|
|
3
|
+
var __awaiter = this && this.__awaiter || function (thisArg, _arguments, P, generator) {
|
|
4
|
+
function adopt(value) {
|
|
5
|
+
return value instanceof P ? value : new P(function (resolve) {
|
|
6
|
+
resolve(value);
|
|
7
|
+
});
|
|
8
|
+
}
|
|
9
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
10
|
+
function fulfilled(value) {
|
|
11
|
+
try {
|
|
12
|
+
step(generator.next(value));
|
|
13
|
+
} catch (e) {
|
|
14
|
+
reject(e);
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
function rejected(value) {
|
|
18
|
+
try {
|
|
19
|
+
step(generator['throw'](value));
|
|
20
|
+
} catch (e) {
|
|
21
|
+
reject(e);
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
function step(result) {
|
|
25
|
+
result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
|
|
26
|
+
}
|
|
27
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
28
|
+
});
|
|
29
|
+
};
|
|
30
|
+
var __generator = this && this.__generator || function (thisArg, body) {
|
|
31
|
+
var _ = {
|
|
32
|
+
label: 0,
|
|
33
|
+
sent: function sent() {
|
|
34
|
+
if (t[0] & 1) throw t[1];
|
|
35
|
+
return t[1];
|
|
36
|
+
},
|
|
37
|
+
trys: [],
|
|
38
|
+
ops: []
|
|
39
|
+
},
|
|
40
|
+
f,
|
|
41
|
+
y,
|
|
42
|
+
t,
|
|
43
|
+
g;
|
|
44
|
+
return g = {
|
|
45
|
+
next: verb(0),
|
|
46
|
+
throw: verb(1),
|
|
47
|
+
return: verb(2)
|
|
48
|
+
}, typeof Symbol === 'function' && (g[Symbol.iterator] = function () {
|
|
49
|
+
return this;
|
|
50
|
+
}), g;
|
|
51
|
+
function verb(n) {
|
|
52
|
+
return function (v) {
|
|
53
|
+
return step([n, v]);
|
|
54
|
+
};
|
|
55
|
+
}
|
|
56
|
+
function step(op) {
|
|
57
|
+
if (f) throw new TypeError('Generator is already executing.');
|
|
58
|
+
while (_) try {
|
|
59
|
+
if (f = 1, y && (t = op[0] & 2 ? y['return'] : op[0] ? y['throw'] || ((t = y['return']) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
60
|
+
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
61
|
+
switch (op[0]) {
|
|
62
|
+
case 0:
|
|
63
|
+
case 1:
|
|
64
|
+
t = op;
|
|
65
|
+
break;
|
|
66
|
+
case 4:
|
|
67
|
+
_.label++;
|
|
68
|
+
return {
|
|
69
|
+
value: op[1],
|
|
70
|
+
done: false
|
|
71
|
+
};
|
|
72
|
+
case 5:
|
|
73
|
+
_.label++;
|
|
74
|
+
y = op[1];
|
|
75
|
+
op = [0];
|
|
76
|
+
continue;
|
|
77
|
+
case 7:
|
|
78
|
+
op = _.ops.pop();
|
|
79
|
+
_.trys.pop();
|
|
80
|
+
continue;
|
|
81
|
+
default:
|
|
82
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
|
|
83
|
+
_ = 0;
|
|
84
|
+
continue;
|
|
85
|
+
}
|
|
86
|
+
if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
|
|
87
|
+
_.label = op[1];
|
|
88
|
+
break;
|
|
89
|
+
}
|
|
90
|
+
if (op[0] === 6 && _.label < t[1]) {
|
|
91
|
+
_.label = t[1];
|
|
92
|
+
t = op;
|
|
93
|
+
break;
|
|
94
|
+
}
|
|
95
|
+
if (t && _.label < t[2]) {
|
|
96
|
+
_.label = t[2];
|
|
97
|
+
_.ops.push(op);
|
|
98
|
+
break;
|
|
99
|
+
}
|
|
100
|
+
if (t[2]) _.ops.pop();
|
|
101
|
+
_.trys.pop();
|
|
102
|
+
continue;
|
|
103
|
+
}
|
|
104
|
+
op = body.call(thisArg, _);
|
|
105
|
+
} catch (e) {
|
|
106
|
+
op = [6, e];
|
|
107
|
+
y = 0;
|
|
108
|
+
} finally {
|
|
109
|
+
f = t = 0;
|
|
110
|
+
}
|
|
111
|
+
if (op[0] & 5) throw op[1];
|
|
112
|
+
return {
|
|
113
|
+
value: op[0] ? op[1] : void 0,
|
|
114
|
+
done: true
|
|
115
|
+
};
|
|
116
|
+
}
|
|
117
|
+
};
|
|
118
|
+
exports.__esModule = true;
|
|
119
|
+
var react_1 = require('react');
|
|
120
|
+
var useGetHasErpData_1 = require("../hook/useGetHasErpData");
|
|
121
|
+
var ahooks_1 = require('ahooks');
|
|
122
|
+
var kmkf_utils_1 = require('@kmkf-fe-packages/kmkf-utils');
|
|
123
|
+
function useGetErpAddressData(notJudgedErp) {
|
|
124
|
+
var _this = this;
|
|
125
|
+
var _a = react_1.useState('loading'),
|
|
126
|
+
globalState = _a[0],
|
|
127
|
+
setGlobalState = _a[1];
|
|
128
|
+
var hasErpData = useGetHasErpData_1['default']();
|
|
129
|
+
ahooks_1.useUpdateEffect(function () {
|
|
130
|
+
asyncQueryData(hasErpData, notJudgedErp);
|
|
131
|
+
}, [hasErpData, notJudgedErp]);
|
|
132
|
+
var asyncQueryData = function asyncQueryData(hasErpData, notJudgedErp) {
|
|
133
|
+
return __awaiter(_this, void 0, void 0, function () {
|
|
134
|
+
var hasBs, hasWdt, hasGy, promises, e_1;
|
|
135
|
+
return __generator(this, function (_a) {
|
|
136
|
+
switch (_a.label) {
|
|
137
|
+
case 0:
|
|
138
|
+
hasBs = hasErpData.hasBs, hasWdt = hasErpData.hasWdt, hasGy = hasErpData.hasGy;
|
|
139
|
+
promises = [];
|
|
140
|
+
if (hasBs || notJudgedErp) promises.push(kmkf_utils_1.servers.queryBsAddressData);
|
|
141
|
+
if (hasWdt || notJudgedErp) promises.push(kmkf_utils_1.servers.queryWdtAddressData);
|
|
142
|
+
if (hasGy || notJudgedErp) promises.push(kmkf_utils_1.servers.queryGyAddressData);
|
|
143
|
+
_a.label = 1;
|
|
144
|
+
case 1:
|
|
145
|
+
_a.trys.push([1, 3,, 4]);
|
|
146
|
+
return [4 /*yield*/, Promise.all(promises.map(function (promise) {
|
|
147
|
+
return promise();
|
|
148
|
+
}))];
|
|
149
|
+
case 2:
|
|
150
|
+
_a.sent();
|
|
151
|
+
setGlobalState('success');
|
|
152
|
+
return [3 /*break*/, 4];
|
|
153
|
+
case 3:
|
|
154
|
+
e_1 = _a.sent();
|
|
155
|
+
setGlobalState('failed');
|
|
156
|
+
return [3 /*break*/, 4];
|
|
157
|
+
case 4:
|
|
158
|
+
return [2 /*return*/];
|
|
159
|
+
}
|
|
160
|
+
});
|
|
161
|
+
});
|
|
162
|
+
};
|
|
163
|
+
|
|
164
|
+
var onReload = function onReload() {
|
|
165
|
+
return __awaiter(_this, void 0, void 0, function () {
|
|
166
|
+
return __generator(this, function (_a) {
|
|
167
|
+
switch (_a.label) {
|
|
168
|
+
case 0:
|
|
169
|
+
return [4 /*yield*/, asyncQueryData(hasErpData, notJudgedErp)];
|
|
170
|
+
case 1:
|
|
171
|
+
_a.sent();
|
|
172
|
+
return [2 /*return*/];
|
|
173
|
+
}
|
|
174
|
+
});
|
|
175
|
+
});
|
|
176
|
+
};
|
|
177
|
+
|
|
178
|
+
return [globalState, onReload];
|
|
179
|
+
}
|
|
180
|
+
exports['default'] = useGetErpAddressData;
|
|
@@ -0,0 +1,186 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
|
|
3
|
+
var __awaiter = this && this.__awaiter || function (thisArg, _arguments, P, generator) {
|
|
4
|
+
function adopt(value) {
|
|
5
|
+
return value instanceof P ? value : new P(function (resolve) {
|
|
6
|
+
resolve(value);
|
|
7
|
+
});
|
|
8
|
+
}
|
|
9
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
10
|
+
function fulfilled(value) {
|
|
11
|
+
try {
|
|
12
|
+
step(generator.next(value));
|
|
13
|
+
} catch (e) {
|
|
14
|
+
reject(e);
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
function rejected(value) {
|
|
18
|
+
try {
|
|
19
|
+
step(generator['throw'](value));
|
|
20
|
+
} catch (e) {
|
|
21
|
+
reject(e);
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
function step(result) {
|
|
25
|
+
result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
|
|
26
|
+
}
|
|
27
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
28
|
+
});
|
|
29
|
+
};
|
|
30
|
+
var __generator = this && this.__generator || function (thisArg, body) {
|
|
31
|
+
var _ = {
|
|
32
|
+
label: 0,
|
|
33
|
+
sent: function sent() {
|
|
34
|
+
if (t[0] & 1) throw t[1];
|
|
35
|
+
return t[1];
|
|
36
|
+
},
|
|
37
|
+
trys: [],
|
|
38
|
+
ops: []
|
|
39
|
+
},
|
|
40
|
+
f,
|
|
41
|
+
y,
|
|
42
|
+
t,
|
|
43
|
+
g;
|
|
44
|
+
return g = {
|
|
45
|
+
next: verb(0),
|
|
46
|
+
throw: verb(1),
|
|
47
|
+
return: verb(2)
|
|
48
|
+
}, typeof Symbol === 'function' && (g[Symbol.iterator] = function () {
|
|
49
|
+
return this;
|
|
50
|
+
}), g;
|
|
51
|
+
function verb(n) {
|
|
52
|
+
return function (v) {
|
|
53
|
+
return step([n, v]);
|
|
54
|
+
};
|
|
55
|
+
}
|
|
56
|
+
function step(op) {
|
|
57
|
+
if (f) throw new TypeError('Generator is already executing.');
|
|
58
|
+
while (_) try {
|
|
59
|
+
if (f = 1, y && (t = op[0] & 2 ? y['return'] : op[0] ? y['throw'] || ((t = y['return']) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
60
|
+
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
61
|
+
switch (op[0]) {
|
|
62
|
+
case 0:
|
|
63
|
+
case 1:
|
|
64
|
+
t = op;
|
|
65
|
+
break;
|
|
66
|
+
case 4:
|
|
67
|
+
_.label++;
|
|
68
|
+
return {
|
|
69
|
+
value: op[1],
|
|
70
|
+
done: false
|
|
71
|
+
};
|
|
72
|
+
case 5:
|
|
73
|
+
_.label++;
|
|
74
|
+
y = op[1];
|
|
75
|
+
op = [0];
|
|
76
|
+
continue;
|
|
77
|
+
case 7:
|
|
78
|
+
op = _.ops.pop();
|
|
79
|
+
_.trys.pop();
|
|
80
|
+
continue;
|
|
81
|
+
default:
|
|
82
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
|
|
83
|
+
_ = 0;
|
|
84
|
+
continue;
|
|
85
|
+
}
|
|
86
|
+
if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
|
|
87
|
+
_.label = op[1];
|
|
88
|
+
break;
|
|
89
|
+
}
|
|
90
|
+
if (op[0] === 6 && _.label < t[1]) {
|
|
91
|
+
_.label = t[1];
|
|
92
|
+
t = op;
|
|
93
|
+
break;
|
|
94
|
+
}
|
|
95
|
+
if (t && _.label < t[2]) {
|
|
96
|
+
_.label = t[2];
|
|
97
|
+
_.ops.push(op);
|
|
98
|
+
break;
|
|
99
|
+
}
|
|
100
|
+
if (t[2]) _.ops.pop();
|
|
101
|
+
_.trys.pop();
|
|
102
|
+
continue;
|
|
103
|
+
}
|
|
104
|
+
op = body.call(thisArg, _);
|
|
105
|
+
} catch (e) {
|
|
106
|
+
op = [6, e];
|
|
107
|
+
y = 0;
|
|
108
|
+
} finally {
|
|
109
|
+
f = t = 0;
|
|
110
|
+
}
|
|
111
|
+
if (op[0] & 5) throw op[1];
|
|
112
|
+
return {
|
|
113
|
+
value: op[0] ? op[1] : void 0,
|
|
114
|
+
done: true
|
|
115
|
+
};
|
|
116
|
+
}
|
|
117
|
+
};
|
|
118
|
+
exports.__esModule = true;
|
|
119
|
+
var react_1 = require('react');
|
|
120
|
+
var useGetHasErpData_1 = require("../hook/useGetHasErpData");
|
|
121
|
+
var ahooks_1 = require('ahooks');
|
|
122
|
+
var api_1 = require("../../../service/api");
|
|
123
|
+
function useGetErpLogisticsCompany(notJudgedErp) {
|
|
124
|
+
var _this = this;
|
|
125
|
+
var _a = react_1.useState('loading'),
|
|
126
|
+
globalState = _a[0],
|
|
127
|
+
setGlobalState = _a[1];
|
|
128
|
+
var hasErpData = useGetHasErpData_1['default']();
|
|
129
|
+
ahooks_1.useUpdateEffect(function () {
|
|
130
|
+
asyncQueryData(hasErpData, notJudgedErp);
|
|
131
|
+
}, [hasErpData, notJudgedErp]);
|
|
132
|
+
var asyncQueryData = function asyncQueryData(hasErpData, notJudgedErp) {
|
|
133
|
+
return __awaiter(_this, void 0, void 0, function () {
|
|
134
|
+
var hasWdt, hasE3, hasJst, hasWln, promises, e_1;
|
|
135
|
+
return __generator(this, function (_a) {
|
|
136
|
+
switch (_a.label) {
|
|
137
|
+
case 0:
|
|
138
|
+
hasWdt = hasErpData.hasWdt, hasE3 = hasErpData.hasE3, hasJst = hasErpData.hasJst, hasWln = hasErpData.hasWln;
|
|
139
|
+
promises = [api_1.queryKMLogisticsCompany];
|
|
140
|
+
if (hasWdt || notJudgedErp) promises.push(api_1.queryWdtLogisticsCompany);
|
|
141
|
+
if (hasE3 || notJudgedErp) promises.push(api_1.queryBsE3LogisticsCompany);
|
|
142
|
+
if (hasJst || notJudgedErp) promises.push(api_1.queryJSTLogisticsCompany);
|
|
143
|
+
if (hasWln || notJudgedErp) promises.push(api_1.queryWLNLogisticsCompany);
|
|
144
|
+
if (!hasWdt && !hasE3 && !hasJst && !hasWln && !notJudgedErp) {
|
|
145
|
+
setGlobalState('success');
|
|
146
|
+
return [2 /*return*/];
|
|
147
|
+
}
|
|
148
|
+
|
|
149
|
+
_a.label = 1;
|
|
150
|
+
case 1:
|
|
151
|
+
_a.trys.push([1, 3,, 4]);
|
|
152
|
+
return [4 /*yield*/, Promise.all(promises.map(function (promise) {
|
|
153
|
+
return promise();
|
|
154
|
+
}))];
|
|
155
|
+
case 2:
|
|
156
|
+
_a.sent();
|
|
157
|
+
setGlobalState('success');
|
|
158
|
+
return [3 /*break*/, 4];
|
|
159
|
+
case 3:
|
|
160
|
+
e_1 = _a.sent();
|
|
161
|
+
setGlobalState('failed');
|
|
162
|
+
return [3 /*break*/, 4];
|
|
163
|
+
case 4:
|
|
164
|
+
return [2 /*return*/];
|
|
165
|
+
}
|
|
166
|
+
});
|
|
167
|
+
});
|
|
168
|
+
};
|
|
169
|
+
|
|
170
|
+
var onReload = function onReload() {
|
|
171
|
+
return __awaiter(_this, void 0, void 0, function () {
|
|
172
|
+
return __generator(this, function (_a) {
|
|
173
|
+
switch (_a.label) {
|
|
174
|
+
case 0:
|
|
175
|
+
return [4 /*yield*/, asyncQueryData(hasErpData, notJudgedErp)];
|
|
176
|
+
case 1:
|
|
177
|
+
_a.sent();
|
|
178
|
+
return [2 /*return*/];
|
|
179
|
+
}
|
|
180
|
+
});
|
|
181
|
+
});
|
|
182
|
+
};
|
|
183
|
+
|
|
184
|
+
return [globalState, onReload];
|
|
185
|
+
}
|
|
186
|
+
exports['default'] = useGetErpLogisticsCompany;
|
|
@@ -48,7 +48,10 @@ var PaymentWorkOrderList = function PaymentWorkOrderList(_ref) {
|
|
|
48
48
|
return state.workOrder.userInfo.shopList;
|
|
49
49
|
});
|
|
50
50
|
var buyerId = platformInfo.buyerId,
|
|
51
|
-
platform = platformInfo.platform
|
|
51
|
+
platform = platformInfo.platform,
|
|
52
|
+
otherInfo = platformInfo.otherInfo;
|
|
53
|
+
var oldBuyerId = otherInfo === null || otherInfo === void 0 ? void 0 : otherInfo.oldBuyerId;
|
|
54
|
+
var buyerOpenUid = [buyerId, oldBuyerId].filter(Boolean).join(',');
|
|
52
55
|
var _useState = useState(true),
|
|
53
56
|
_useState2 = _slicedToArray(_useState, 2),
|
|
54
57
|
open = _useState2[0],
|
|
@@ -70,7 +73,8 @@ var PaymentWorkOrderList = function PaymentWorkOrderList(_ref) {
|
|
|
70
73
|
form = _Form$useForm2[0];
|
|
71
74
|
useEffect(function () {
|
|
72
75
|
var newSearch = _objectSpread(_objectSpread({}, paySearch), {}, {
|
|
73
|
-
isBuyer: !!buyerId
|
|
76
|
+
isBuyer: !!buyerId,
|
|
77
|
+
buyerOpenUid: buyerOpenUid
|
|
74
78
|
});
|
|
75
79
|
setPaySearch(newSearch);
|
|
76
80
|
setTimeout(function () {
|
|
@@ -78,7 +82,7 @@ var PaymentWorkOrderList = function PaymentWorkOrderList(_ref) {
|
|
|
78
82
|
onSearch(newSearch);
|
|
79
83
|
}
|
|
80
84
|
}, 0); // TODO: 让请求在下一个任务中执行,前一个任务获取不到redux中的数据
|
|
81
|
-
}, [buyerId]);
|
|
85
|
+
}, [buyerId, oldBuyerId, buyerOpenUid]);
|
|
82
86
|
var onSearch = function onSearch() {
|
|
83
87
|
var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
|
|
84
88
|
dispatch(fetchQueryPaymentWorkOrderList(params || paySearch));
|
|
@@ -123,7 +127,8 @@ var PaymentWorkOrderList = function PaymentWorkOrderList(_ref) {
|
|
|
123
127
|
workPayStatus: '',
|
|
124
128
|
tid: '',
|
|
125
129
|
paymentMixUk: '',
|
|
126
|
-
isBuyer: paySearch.isBuyer
|
|
130
|
+
isBuyer: paySearch.isBuyer,
|
|
131
|
+
buyerOpenUid: buyerOpenUid
|
|
127
132
|
};
|
|
128
133
|
setPaySearch(newSearch);
|
|
129
134
|
form.setFieldsValue({
|
|
@@ -71,6 +71,7 @@ var workOrderStatus = [{
|
|
|
71
71
|
var getTableData = function getTableData(_ref3) {
|
|
72
72
|
var checkedBuyerId = _ref3.checkedBuyerId,
|
|
73
73
|
buyerId = _ref3.buyerId,
|
|
74
|
+
oldBuyerId = _ref3.oldBuyerId,
|
|
74
75
|
shopList = _ref3.shopList,
|
|
75
76
|
shopId = _ref3.shopId;
|
|
76
77
|
return function (_ref4, formData) {
|
|
@@ -89,7 +90,7 @@ var getTableData = function getTableData(_ref3) {
|
|
|
89
90
|
params.endCreatedTime = time[1] ? moment(time[1]).endOf('day').format('YYYY-MM-DD 23:mm:ss') : undefined;
|
|
90
91
|
}
|
|
91
92
|
if (checkedBuyerId) {
|
|
92
|
-
params.buyerOpenUid = buyerId;
|
|
93
|
+
params.buyerOpenUid = [buyerId, oldBuyerId].filter(Boolean).join(',');
|
|
93
94
|
}
|
|
94
95
|
delete params.time; // time是moment类型的,监控上报的时侯,格式化报错了
|
|
95
96
|
var shopUniqueKey = (_ref5 = shopList || []) === null || _ref5 === void 0 ? void 0 : (_ref5$find = _ref5.find(function (item) {
|
|
@@ -244,6 +245,7 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref6) {
|
|
|
244
245
|
shopId = platformInfo.shopId,
|
|
245
246
|
orderNo = platformInfo.orderNo,
|
|
246
247
|
userKey = platformInfo.userKey;
|
|
248
|
+
var oldBuyerId = otherInfo === null || otherInfo === void 0 ? void 0 : otherInfo.oldBuyerId;
|
|
247
249
|
var templateRef = useRef();
|
|
248
250
|
var searchRef = useRef();
|
|
249
251
|
var _Form$useForm = Form.useForm(),
|
|
@@ -265,9 +267,10 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref6) {
|
|
|
265
267
|
var callBackGetTableData = useCallback(getTableData({
|
|
266
268
|
checkedBuyerId: currentBuyerChecked,
|
|
267
269
|
buyerId: buyerId,
|
|
270
|
+
oldBuyerId: oldBuyerId,
|
|
268
271
|
shopList: shopList,
|
|
269
272
|
shopId: shopId
|
|
270
|
-
}), [currentBuyerChecked, buyerId, shopList]);
|
|
273
|
+
}), [currentBuyerChecked, buyerId, oldBuyerId, shopList, shopId]);
|
|
271
274
|
var _useInfiniteScroll = useInfiniteScroll(function (d) {
|
|
272
275
|
var page = d ? Math.ceil(d.list.length / 10) + 1 : 1;
|
|
273
276
|
return callBackGetTableData({
|
|
@@ -57,6 +57,11 @@ export var systemOrderMap = {
|
|
|
57
57
|
ids: 'kmSystemSelectIds',
|
|
58
58
|
order: 'kmSystemShowOrder'
|
|
59
59
|
},
|
|
60
|
+
KM_AFTER_SALES_ORDER: {
|
|
61
|
+
no: 'kmAfterSalesOrderNo',
|
|
62
|
+
ids: 'kmAfterSalesSelectIds',
|
|
63
|
+
order: 'kmAfterSalesShowOrder'
|
|
64
|
+
},
|
|
60
65
|
WLN_SYSTEM_ORDER: {
|
|
61
66
|
no: 'wlnSystemOrderNo',
|
|
62
67
|
ids: 'wlnSystemSelectIds',
|
|
@@ -399,6 +404,10 @@ export var SUBMIT_COMPONENT_GOODS_MAP = {
|
|
|
399
404
|
type: 'kmGoods',
|
|
400
405
|
shopCode: 'shopCode'
|
|
401
406
|
},
|
|
407
|
+
KM_AFTERSALE_GOODS: {
|
|
408
|
+
type: 'kmAftersaleGoods',
|
|
409
|
+
shopCode: 'shopCode'
|
|
410
|
+
},
|
|
402
411
|
JY_GOODS: {
|
|
403
412
|
type: 'jyGoods',
|
|
404
413
|
shopCode: 'shopCode'
|
|
@@ -520,6 +529,12 @@ export var SUBMIT_COMPONENT_SYSTEM_ORDER_MAP = {
|
|
|
520
529
|
order: 'kmSystemShowOrder',
|
|
521
530
|
select: 'billNo'
|
|
522
531
|
},
|
|
532
|
+
KM_AFTER_SALES_ORDER: {
|
|
533
|
+
no: 'kmAfterSalesOrderNo',
|
|
534
|
+
ids: 'kmAfterSalesSelectIds',
|
|
535
|
+
order: 'kmAfterSalesShowOrder',
|
|
536
|
+
select: 'id'
|
|
537
|
+
},
|
|
523
538
|
WLN_SYSTEM_ORDER: {
|
|
524
539
|
no: 'wlnSystemOrderNo',
|
|
525
540
|
ids: 'wlnSystemSelectIds',
|