@kmkf-fe-packages/services-components 2.0.54-beta.4 → 2.0.54-beta.41
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/commonComponents/GlobalContext/hook/dist/useGetHasErpData.js +52 -0
- package/dist/esm/commonComponents/GlobalContext/index.js +26 -3
- package/dist/esm/commonComponents/GlobalContext/orderQuery/constants.d.ts +5 -0
- package/dist/esm/commonComponents/GlobalContext/orderQuery/constants.js +8 -0
- package/dist/esm/commonComponents/GlobalContext/orderQuery/dist/useGetErpAddressData.js +180 -0
- package/dist/esm/commonComponents/GlobalContext/orderQuery/dist/useGetErpLogisticsCompany.js +186 -0
- package/dist/esm/commonComponents/GlobalContext/orderQuery/useGetErpLogisticsCompany.js +13 -12
- package/dist/esm/commonComponents/GlobalContext/orderQuery/useGetErpSendData.js +1 -1
- package/dist/esm/commonComponents/GlobalContext/orderQuery/useGetRequest.d.ts +3 -0
- package/dist/esm/commonComponents/GlobalContext/orderQuery/useGetRequest.js +80 -0
- package/dist/esm/components/BS/BsGoods/dist/index.js +113 -0
- package/dist/esm/components/BS/BsLogistics/index.js +8 -0
- package/dist/esm/components/BS/common/BsMemo.js +2 -1
- package/dist/esm/components/BS/common/BsType.js +2 -1
- package/dist/esm/components/BS/common/SystemOrderNo.js +2 -1
- package/dist/esm/components/BS/common/expressCode.js +3 -0
- package/dist/esm/components/BS/common/expressCompany.js +3 -0
- package/dist/esm/components/BuyerNick/index.js +1 -1
- package/dist/esm/components/Common/constants/columnsBaseInfoMap.js +4 -2
- package/dist/esm/components/Common/dist/index.js +1019 -0
- package/dist/esm/components/Common/index.js +4 -6
- package/dist/esm/components/CommonHeaderGood/index.js +124 -4
- package/dist/esm/components/GY/GyReissue/index.js +1 -1
- package/dist/esm/components/GY/GyReturn/index.js +11 -11
- package/dist/esm/components/GetFormItem/index.js +1 -1
- package/dist/esm/components/Logistics/index.d.ts +1 -0
- package/dist/esm/components/Logistics/index.js +19 -3
- package/dist/esm/components/LogisticsInterception/index.js +16 -8
- package/dist/esm/components/LogisticsMoreInterception/index.js +26 -15
- package/dist/esm/components/LogisticsTrajectory/index.d.ts +14 -11
- package/dist/esm/components/LogisticsTrajectory/index.js +19 -11
- package/dist/esm/components/LogisticsTrajectory/trajectoryApiStatus.d.ts +41 -0
- package/dist/esm/components/LogisticsTrajectory/trajectoryApiStatus.js +112 -0
- package/dist/esm/components/MsgStatus/index.d.ts +2 -0
- package/dist/esm/components/MsgStatus/index.js +4 -0
- package/dist/esm/components/PicturePro/PictureUrl.d.ts +1 -0
- package/dist/esm/components/PicturePro/PictureUrl.js +4 -0
- package/dist/esm/components/Public/AsyncSelect/index.d.ts +43 -0
- package/dist/esm/components/Public/AsyncSelect/index.js +189 -0
- package/dist/esm/components/Public/Goods/index.d.ts +3 -0
- package/dist/esm/components/Public/Goods/index.js +4 -1
- package/dist/esm/components/Public/ReissueGoods/index.js +18 -0
- package/dist/esm/components/Reissue/Logistics/index.d.ts +1 -11
- package/dist/esm/components/Reissue/Logistics/index.js +15 -35
- package/dist/esm/components/WDT/WdtShopSelect/index.d.ts +40 -0
- package/dist/esm/components/WDT/WdtShopSelect/index.js +122 -0
- package/dist/esm/factory.d.ts +2 -2
- package/dist/esm/factory.js +8 -1
- package/dist/esm/index.d.ts +2 -0
- package/dist/esm/index.js +2 -0
- package/dist/esm/service/api.d.ts +1 -0
- package/dist/esm/service/api.js +6 -0
- package/dist/esm/type.d.ts +17 -15
- package/package.json +4 -4
|
@@ -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;
|
|
@@ -20,6 +20,7 @@ import { servers, SendDataCenter } from "@kmkf-fe-packages/kmkf-utils";
|
|
|
20
20
|
import useGetErpLogisticsCompany from "./orderQuery/useGetErpLogisticsCompany";
|
|
21
21
|
import useGetErpSendData from "./orderQuery/useGetErpSendData";
|
|
22
22
|
import useGetErpAddressData from "./orderQuery/useGetErpAddressData";
|
|
23
|
+
import useGetRequest from "./orderQuery/useGetRequest";
|
|
23
24
|
/**
|
|
24
25
|
* 尽量不要直接使用redux,飞鸽项目redux并不会读取最近的store数据,使用redux会有问题,暂时使用从外部传入redux数据的方式
|
|
25
26
|
* **/
|
|
@@ -49,6 +50,15 @@ var Global = function Global(_ref) {
|
|
|
49
50
|
}
|
|
50
51
|
return reduxData;
|
|
51
52
|
}, [JSON.stringify(reduxData)]);
|
|
53
|
+
useEffect(function () {
|
|
54
|
+
try {
|
|
55
|
+
var _reduxData$main2, _reduxData$workOrder2, _reduxData$global2;
|
|
56
|
+
var userInfo = (reduxData === null || reduxData === void 0 ? void 0 : (_reduxData$main2 = reduxData.main) === null || _reduxData$main2 === void 0 ? void 0 : _reduxData$main2.userInfo) || (reduxData === null || reduxData === void 0 ? void 0 : (_reduxData$workOrder2 = reduxData.workOrder) === null || _reduxData$workOrder2 === void 0 ? void 0 : _reduxData$workOrder2.userInfo) || (reduxData === null || reduxData === void 0 ? void 0 : (_reduxData$global2 = reduxData.global) === null || _reduxData$global2 === void 0 ? void 0 : _reduxData$global2.userInfo) || {};
|
|
57
|
+
localStorage.setItem("reduxData_userInfo", JSON.stringify(userInfo));
|
|
58
|
+
} catch (e) {
|
|
59
|
+
console.error(e);
|
|
60
|
+
}
|
|
61
|
+
}, [JSON.stringify(reduxData)]);
|
|
52
62
|
useEffect(function () {
|
|
53
63
|
initDataSource();
|
|
54
64
|
}, []);
|
|
@@ -71,12 +81,17 @@ var Global = function Global(_ref) {
|
|
|
71
81
|
_useGetErpAddressData2 = _slicedToArray(_useGetErpAddressData, 2),
|
|
72
82
|
addressDataState = _useGetErpAddressData2[0],
|
|
73
83
|
reloadGetErpAddressData = _useGetErpAddressData2[1];
|
|
84
|
+
//获取Erp地址数据
|
|
85
|
+
var _useGetRequest = useGetRequest(reduxDataMap, notJudgedErp),
|
|
86
|
+
_useGetRequest2 = _slicedToArray(_useGetRequest, 2),
|
|
87
|
+
requestState = _useGetRequest2[0],
|
|
88
|
+
reloadGetRequest = _useGetRequest2[1];
|
|
74
89
|
var allState = useMemo(function () {
|
|
75
|
-
var allStateList = [globalState, logisticsCompanyState, sendDataState, addressDataState];
|
|
90
|
+
var allStateList = [globalState, logisticsCompanyState, sendDataState, addressDataState, requestState];
|
|
76
91
|
if (allStateList.includes("loading")) return "loading";
|
|
77
92
|
if (allStateList.includes("failed")) return "failed";
|
|
78
93
|
return "success";
|
|
79
|
-
}, [globalState, logisticsCompanyState, sendDataState, addressDataState]);
|
|
94
|
+
}, [globalState, logisticsCompanyState, sendDataState, addressDataState, requestState]);
|
|
80
95
|
var reloadData = /*#__PURE__*/function () {
|
|
81
96
|
var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
|
|
82
97
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
@@ -115,9 +130,17 @@ var Global = function Global(_ref) {
|
|
|
115
130
|
_context.next = 17;
|
|
116
131
|
return reloadGetErpAddressData();
|
|
117
132
|
case 17:
|
|
133
|
+
_context.t4 = requestState === "failed";
|
|
134
|
+
if (!_context.t4) {
|
|
135
|
+
_context.next = 21;
|
|
136
|
+
break;
|
|
137
|
+
}
|
|
138
|
+
_context.next = 21;
|
|
139
|
+
return reloadGetRequest();
|
|
140
|
+
case 21:
|
|
118
141
|
setLoading(false);
|
|
119
142
|
message.success("刷新完成");
|
|
120
|
-
case
|
|
143
|
+
case 23:
|
|
121
144
|
case "end":
|
|
122
145
|
return _context.stop();
|
|
123
146
|
}
|
|
@@ -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;
|
|
@@ -10,7 +10,7 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
|
|
|
10
10
|
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
11
11
|
import { useEffect, useState } from "react";
|
|
12
12
|
import useGetHasErpData from "../hook/useGetHasErpData";
|
|
13
|
-
import { queryWdtLogisticsCompany, queryBsE3LogisticsCompany, queryJSTLogisticsCompany, queryWLNLogisticsCompany } from "../../../service/api";
|
|
13
|
+
import { queryWdtLogisticsCompany, queryBsE3LogisticsCompany, queryJSTLogisticsCompany, queryWLNLogisticsCompany, queryGYLogisticsCompany } from "../../../service/api";
|
|
14
14
|
function useGetErpLogisticsCompany(reduxData, notJudgedErp) {
|
|
15
15
|
var _useState = useState("loading"),
|
|
16
16
|
_useState2 = _slicedToArray(_useState, 2),
|
|
@@ -22,37 +22,38 @@ function useGetErpLogisticsCompany(reduxData, notJudgedErp) {
|
|
|
22
22
|
}, [hasErpData, notJudgedErp]);
|
|
23
23
|
var asyncQueryData = /*#__PURE__*/function () {
|
|
24
24
|
var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(hasErpData, notJudgedErp, isReload) {
|
|
25
|
-
var hasWdt, hasE3, hasJst, hasWln, promises;
|
|
25
|
+
var hasWdt, hasE3, hasJst, hasWln, hasGy, promises;
|
|
26
26
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
27
27
|
while (1) switch (_context.prev = _context.next) {
|
|
28
28
|
case 0:
|
|
29
29
|
if (!isReload) {
|
|
30
30
|
setGlobalState("loading");
|
|
31
31
|
}
|
|
32
|
-
hasWdt = hasErpData.hasWdt, hasE3 = hasErpData.hasE3, hasJst = hasErpData.hasJst, hasWln = hasErpData.hasWln;
|
|
32
|
+
hasWdt = hasErpData.hasWdt, hasE3 = hasErpData.hasE3, hasJst = hasErpData.hasJst, hasWln = hasErpData.hasWln, hasGy = hasErpData.hasGy;
|
|
33
33
|
promises = [];
|
|
34
34
|
if (hasWdt || notJudgedErp) promises.push(queryWdtLogisticsCompany);
|
|
35
35
|
if (hasE3 || notJudgedErp) promises.push(queryBsE3LogisticsCompany);
|
|
36
36
|
if (hasJst || notJudgedErp) promises.push(queryJSTLogisticsCompany);
|
|
37
37
|
if (hasWln || notJudgedErp) promises.push(queryWLNLogisticsCompany);
|
|
38
|
-
|
|
39
|
-
_context.
|
|
38
|
+
if (hasGy || notJudgedErp) promises.push(queryGYLogisticsCompany);
|
|
39
|
+
_context.prev = 8;
|
|
40
|
+
_context.next = 11;
|
|
40
41
|
return Promise.all(promises.map(function (promise) {
|
|
41
42
|
return promise();
|
|
42
43
|
}));
|
|
43
|
-
case
|
|
44
|
+
case 11:
|
|
44
45
|
setGlobalState("success");
|
|
45
|
-
_context.next =
|
|
46
|
+
_context.next = 17;
|
|
46
47
|
break;
|
|
47
|
-
case
|
|
48
|
-
_context.prev =
|
|
49
|
-
_context.t0 = _context["catch"](
|
|
48
|
+
case 14:
|
|
49
|
+
_context.prev = 14;
|
|
50
|
+
_context.t0 = _context["catch"](8);
|
|
50
51
|
setGlobalState("failed");
|
|
51
|
-
case
|
|
52
|
+
case 17:
|
|
52
53
|
case "end":
|
|
53
54
|
return _context.stop();
|
|
54
55
|
}
|
|
55
|
-
}, _callee, null, [[
|
|
56
|
+
}, _callee, null, [[8, 14]]);
|
|
56
57
|
}));
|
|
57
58
|
return function asyncQueryData(_x2, _x3, _x4) {
|
|
58
59
|
return _ref.apply(this, arguments);
|
|
@@ -18,7 +18,7 @@ function useGetErpSendData(reduxData, notJudgedErp) {
|
|
|
18
18
|
setGlobalState = _useState2[1];
|
|
19
19
|
var hasErpData = useGetHasErpData(reduxData);
|
|
20
20
|
useEffect(function () {
|
|
21
|
-
console.log("发货仓--", hasErpData, notJudgedErp);
|
|
21
|
+
// console.log("发货仓--", hasErpData, notJudgedErp);
|
|
22
22
|
asyncQueryData(hasErpData, notJudgedErp);
|
|
23
23
|
}, [hasErpData, notJudgedErp]);
|
|
24
24
|
var asyncQueryData = /*#__PURE__*/function () {
|