@kmkf-fe-packages/services-components 2.2.44-beta.3 → 2.2.44-beta.30
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/useGetHasErpData.d.ts +1 -1
- package/dist/esm/commonComponents/GlobalContext/hook/useGetHasErpData.js +3 -2
- package/dist/esm/commonComponents/GlobalContext/orderQuery/useGetErpAddressData.js +4 -2
- package/dist/esm/commonComponents/GlobalContext/orderQuery/useGetErpLogisticsCompany.js +13 -12
- package/dist/esm/commonComponents/QueryLogisticsTrack/index.d.ts +2 -1
- package/dist/esm/commonComponents/QueryLogisticsTrack/index.js +4 -2
- 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/CommonMultiStatus/index.js +38 -3
- package/dist/esm/components/LogisticsMoreInterception/index.js +1 -0
- package/dist/esm/components/Public/ReissueGoods/index.js +18 -0
- package/dist/esm/factory.d.ts +1 -1
- package/dist/esm/factory.js +2 -0
- package/dist/esm/service/api.js +1 -0
- package/package.json +4 -4
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
declare type HasErpDataKeyType = "hasWln" | "hasWdt" | "hasBs" | "hasE3" | "hasJst" | "hasGy" | "hasJy";
|
|
1
|
+
declare type HasErpDataKeyType = "hasWln" | "hasWdt" | "hasBs" | "hasE3" | "hasJst" | "hasGy" | "hasJy" | "hasJky";
|
|
2
2
|
declare function useGetHasErpData(reduxData: any): Record<HasErpDataKeyType, boolean>;
|
|
3
3
|
export default useGetHasErpData;
|
|
@@ -6,7 +6,7 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
|
|
|
6
6
|
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
7
7
|
import { useEffect, useMemo, useState } from "react";
|
|
8
8
|
var getTemplate = function getTemplate(companyUserConfig) {
|
|
9
|
-
var _companyUserConfig$pl, _companyUserConfig$pl2, _companyUserConfig$pl3, _companyUserConfig$pl4, _companyUserConfig$pl5, _companyUserConfig$pl6, _companyUserConfig$pl7, _companyUserConfig$pl8, _companyUserConfig$pl9, _companyUserConfig$pl10, _companyUserConfig$pl11, _companyUserConfig$pl12, _companyUserConfig$pl13, _companyUserConfig$pl14, _companyUserConfig$pl15, _companyUserConfig$pl16, _companyUserConfig$pl17, _companyUserConfig$pl18, _companyUserConfig$pl19, _companyUserConfig$pl20, _companyUserConfig$pl21;
|
|
9
|
+
var _companyUserConfig$pl, _companyUserConfig$pl2, _companyUserConfig$pl3, _companyUserConfig$pl4, _companyUserConfig$pl5, _companyUserConfig$pl6, _companyUserConfig$pl7, _companyUserConfig$pl8, _companyUserConfig$pl9, _companyUserConfig$pl10, _companyUserConfig$pl11, _companyUserConfig$pl12, _companyUserConfig$pl13, _companyUserConfig$pl14, _companyUserConfig$pl15, _companyUserConfig$pl16, _companyUserConfig$pl17, _companyUserConfig$pl18, _companyUserConfig$pl19, _companyUserConfig$pl20, _companyUserConfig$pl21, _companyUserConfig$pl22, _companyUserConfig$pl23, _companyUserConfig$pl24;
|
|
10
10
|
return JSON.stringify({
|
|
11
11
|
hasWln: (_companyUserConfig$pl = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : (_companyUserConfig$pl2 = companyUserConfig.plugins) === null || _companyUserConfig$pl2 === void 0 ? void 0 : (_companyUserConfig$pl3 = _companyUserConfig$pl2.wln) === null || _companyUserConfig$pl3 === void 0 ? void 0 : _companyUserConfig$pl3.show) !== null && _companyUserConfig$pl !== void 0 ? _companyUserConfig$pl : false,
|
|
12
12
|
hasWdt: (_companyUserConfig$pl4 = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : (_companyUserConfig$pl5 = companyUserConfig.plugins) === null || _companyUserConfig$pl5 === void 0 ? void 0 : (_companyUserConfig$pl6 = _companyUserConfig$pl5.wdt) === null || _companyUserConfig$pl6 === void 0 ? void 0 : _companyUserConfig$pl6.show) !== null && _companyUserConfig$pl4 !== void 0 ? _companyUserConfig$pl4 : false,
|
|
@@ -14,7 +14,8 @@ var getTemplate = function getTemplate(companyUserConfig) {
|
|
|
14
14
|
hasE3: (_companyUserConfig$pl10 = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : (_companyUserConfig$pl11 = companyUserConfig.plugins) === null || _companyUserConfig$pl11 === void 0 ? void 0 : (_companyUserConfig$pl12 = _companyUserConfig$pl11.bse3) === null || _companyUserConfig$pl12 === void 0 ? void 0 : _companyUserConfig$pl12.show) !== null && _companyUserConfig$pl10 !== void 0 ? _companyUserConfig$pl10 : false,
|
|
15
15
|
hasJst: (_companyUserConfig$pl13 = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : (_companyUserConfig$pl14 = companyUserConfig.plugins) === null || _companyUserConfig$pl14 === void 0 ? void 0 : (_companyUserConfig$pl15 = _companyUserConfig$pl14.jst) === null || _companyUserConfig$pl15 === void 0 ? void 0 : _companyUserConfig$pl15.show) !== null && _companyUserConfig$pl13 !== void 0 ? _companyUserConfig$pl13 : false,
|
|
16
16
|
hasGy: (_companyUserConfig$pl16 = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : (_companyUserConfig$pl17 = companyUserConfig.plugins) === null || _companyUserConfig$pl17 === void 0 ? void 0 : (_companyUserConfig$pl18 = _companyUserConfig$pl17.gy) === null || _companyUserConfig$pl18 === void 0 ? void 0 : _companyUserConfig$pl18.show) !== null && _companyUserConfig$pl16 !== void 0 ? _companyUserConfig$pl16 : false,
|
|
17
|
-
hasJy: (_companyUserConfig$pl19 = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : (_companyUserConfig$pl20 = companyUserConfig.plugins) === null || _companyUserConfig$pl20 === void 0 ? void 0 : (_companyUserConfig$pl21 = _companyUserConfig$pl20.juYi) === null || _companyUserConfig$pl21 === void 0 ? void 0 : _companyUserConfig$pl21.show) !== null && _companyUserConfig$pl19 !== void 0 ? _companyUserConfig$pl19 : false
|
|
17
|
+
hasJy: (_companyUserConfig$pl19 = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : (_companyUserConfig$pl20 = companyUserConfig.plugins) === null || _companyUserConfig$pl20 === void 0 ? void 0 : (_companyUserConfig$pl21 = _companyUserConfig$pl20.juYi) === null || _companyUserConfig$pl21 === void 0 ? void 0 : _companyUserConfig$pl21.show) !== null && _companyUserConfig$pl19 !== void 0 ? _companyUserConfig$pl19 : false,
|
|
18
|
+
hasJky: (_companyUserConfig$pl22 = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : (_companyUserConfig$pl23 = companyUserConfig.plugins) === null || _companyUserConfig$pl23 === void 0 ? void 0 : (_companyUserConfig$pl24 = _companyUserConfig$pl23.jky) === null || _companyUserConfig$pl24 === void 0 ? void 0 : _companyUserConfig$pl24.show) !== null && _companyUserConfig$pl22 !== void 0 ? _companyUserConfig$pl22 : false
|
|
18
19
|
});
|
|
19
20
|
};
|
|
20
21
|
function useGetHasErpData(reduxData) {
|
|
@@ -22,17 +22,19 @@ function useGetErpAddressData(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 hasBs, hasWdt, hasGy, hasJst, promises;
|
|
25
|
+
var hasBs, hasWdt, hasGy, hasJst, hasJky, 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
|
-
hasBs = hasErpData.hasBs, hasWdt = hasErpData.hasWdt, hasGy = hasErpData.hasGy, hasJst = hasErpData.hasJst;
|
|
32
|
+
hasBs = hasErpData.hasBs, hasWdt = hasErpData.hasWdt, hasGy = hasErpData.hasGy, hasJst = hasErpData.hasJst, hasJky = hasErpData.hasJky;
|
|
33
33
|
promises = [];
|
|
34
34
|
if (hasBs || notJudgedErp) promises.push(servers.queryBsAddressData);
|
|
35
35
|
if (hasWdt || notJudgedErp) promises.push(servers.queryWdtAddressData);
|
|
36
|
+
// JKY用的系统的地址,暂时不需要查询
|
|
37
|
+
// if (hasJky || notJudgedErp) promises.push(servers.queryJkyAddressData);
|
|
36
38
|
if (hasGy || notJudgedErp) promises.push(servers.queryGyAddressData);
|
|
37
39
|
if (hasJst || notJudgedErp) promises.push(servers.queryJstAddressData);
|
|
38
40
|
_context.prev = 7;
|
|
@@ -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, queryGYLogisticsCompany, queryJYLogisticsCompany } from "../../../service/api";
|
|
13
|
+
import { queryWdtLogisticsCompany, queryBsE3LogisticsCompany, queryJSTLogisticsCompany, queryWLNLogisticsCompany, queryGYLogisticsCompany, queryJYLogisticsCompany, queryJKYLogisticsCompany } from "../../../service/api";
|
|
14
14
|
function useGetErpLogisticsCompany(reduxData, notJudgedErp) {
|
|
15
15
|
var _useState = useState("loading"),
|
|
16
16
|
_useState2 = _slicedToArray(_useState, 2),
|
|
@@ -22,14 +22,14 @@ 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, hasGy, hasJy, promises;
|
|
25
|
+
var hasWdt, hasE3, hasJst, hasWln, hasGy, hasJy, hasJky, 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, hasGy = hasErpData.hasGy, hasJy = hasErpData.hasJy;
|
|
32
|
+
hasWdt = hasErpData.hasWdt, hasE3 = hasErpData.hasE3, hasJst = hasErpData.hasJst, hasWln = hasErpData.hasWln, hasGy = hasErpData.hasGy, hasJy = hasErpData.hasJy, hasJky = hasErpData.hasJky;
|
|
33
33
|
promises = [];
|
|
34
34
|
if (hasWdt || notJudgedErp) promises.push(queryWdtLogisticsCompany);
|
|
35
35
|
if (hasE3 || notJudgedErp) promises.push(queryBsE3LogisticsCompany);
|
|
@@ -37,24 +37,25 @@ function useGetErpLogisticsCompany(reduxData, notJudgedErp) {
|
|
|
37
37
|
if (hasWln || notJudgedErp) promises.push(queryWLNLogisticsCompany);
|
|
38
38
|
if (hasGy || notJudgedErp) promises.push(queryGYLogisticsCompany);
|
|
39
39
|
if (hasJy || notJudgedErp) promises.push(queryJYLogisticsCompany);
|
|
40
|
-
|
|
41
|
-
_context.
|
|
40
|
+
if (hasJky || notJudgedErp) promises.push(queryJKYLogisticsCompany);
|
|
41
|
+
_context.prev = 10;
|
|
42
|
+
_context.next = 13;
|
|
42
43
|
return Promise.all(promises.map(function (promise) {
|
|
43
44
|
return promise();
|
|
44
45
|
}));
|
|
45
|
-
case
|
|
46
|
+
case 13:
|
|
46
47
|
setGlobalState("success");
|
|
47
|
-
_context.next =
|
|
48
|
+
_context.next = 19;
|
|
48
49
|
break;
|
|
49
|
-
case
|
|
50
|
-
_context.prev =
|
|
51
|
-
_context.t0 = _context["catch"](
|
|
50
|
+
case 16:
|
|
51
|
+
_context.prev = 16;
|
|
52
|
+
_context.t0 = _context["catch"](10);
|
|
52
53
|
setGlobalState("failed");
|
|
53
|
-
case
|
|
54
|
+
case 19:
|
|
54
55
|
case "end":
|
|
55
56
|
return _context.stop();
|
|
56
57
|
}
|
|
57
|
-
}, _callee, null, [[
|
|
58
|
+
}, _callee, null, [[10, 16]]);
|
|
58
59
|
}));
|
|
59
60
|
return function asyncQueryData(_x2, _x3, _x4) {
|
|
60
61
|
return _ref.apply(this, arguments);
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import React from "react";
|
|
2
|
-
declare const QueryLogisticsTrack: ({ title, modelWidth, interceptCompany, interceptCode, interceptSenderMobile, interceptCompanyName, }: {
|
|
2
|
+
declare const QueryLogisticsTrack: ({ title, modelWidth, interceptCompany, interceptCode, interceptSenderMobile, interceptCompanyName, shopUk, }: {
|
|
3
3
|
title?: string | undefined;
|
|
4
4
|
modelWidth?: string | number | undefined;
|
|
5
5
|
interceptCompany?: string | undefined;
|
|
6
6
|
interceptCode: string;
|
|
7
7
|
interceptSenderMobile?: string | number | undefined;
|
|
8
8
|
interceptCompanyName?: string | undefined;
|
|
9
|
+
shopUk?: string | undefined;
|
|
9
10
|
}) => React.JSX.Element;
|
|
10
11
|
export default QueryLogisticsTrack;
|
|
@@ -20,7 +20,8 @@ var QueryLogisticsTrack = function QueryLogisticsTrack(_ref) {
|
|
|
20
20
|
interceptCompany = _ref.interceptCompany,
|
|
21
21
|
interceptCode = _ref.interceptCode,
|
|
22
22
|
interceptSenderMobile = _ref.interceptSenderMobile,
|
|
23
|
-
interceptCompanyName = _ref.interceptCompanyName
|
|
23
|
+
interceptCompanyName = _ref.interceptCompanyName,
|
|
24
|
+
shopUk = _ref.shopUk;
|
|
24
25
|
var _useState = useState(""),
|
|
25
26
|
_useState2 = _slicedToArray(_useState, 2),
|
|
26
27
|
inputVal = _useState2[0],
|
|
@@ -97,7 +98,8 @@ var QueryLogisticsTrack = function QueryLogisticsTrack(_ref) {
|
|
|
97
98
|
mailNo: interceptCode,
|
|
98
99
|
cpCode: interceptCompany,
|
|
99
100
|
mobile: interceptSenderMobile || mobile,
|
|
100
|
-
cpName: interceptCompanyName
|
|
101
|
+
cpName: interceptCompanyName,
|
|
102
|
+
shopUk: shopUk
|
|
101
103
|
},
|
|
102
104
|
handleError: function handleError(msg) {
|
|
103
105
|
msg && message.error(msg);
|
|
@@ -26,7 +26,8 @@ var componentType = {
|
|
|
26
26
|
JST_REISSUE_GOODS: "jstReissueType",
|
|
27
27
|
JST_RETURN_GOODS: "jstReturnType",
|
|
28
28
|
KM_REISSUE_GOODS: "kmReissueType",
|
|
29
|
-
JY_REISSUE_GOODS: "jyReissueType"
|
|
29
|
+
JY_REISSUE_GOODS: "jyReissueType",
|
|
30
|
+
JKY_REISSUE_GOODS: "jkyReissueType"
|
|
30
31
|
};
|
|
31
32
|
var BsMemo = /*#__PURE__*/_createClass(function BsMemo(options) {
|
|
32
33
|
var _this = this;
|
|
@@ -27,7 +27,8 @@ var componentType = {
|
|
|
27
27
|
JST_REISSUE_GOODS: "jstReissueType",
|
|
28
28
|
JST_RETURN_GOODS: "jstReturnType",
|
|
29
29
|
KM_REISSUE_GOODS: "kmReissueType",
|
|
30
|
-
JY_REISSUE_GOODS: "jyReissueType"
|
|
30
|
+
JY_REISSUE_GOODS: "jyReissueType",
|
|
31
|
+
JKY_REISSUE_GOODS: "jkyReissueType"
|
|
31
32
|
};
|
|
32
33
|
var BsType = /*#__PURE__*/_createClass(function BsType(options) {
|
|
33
34
|
var _this = this;
|
|
@@ -22,7 +22,8 @@ var componentType = {
|
|
|
22
22
|
JST_REISSUE_GOODS: "jstSystemOrderNo",
|
|
23
23
|
JST_RETURN_GOODS: "jstSystemOrderNo",
|
|
24
24
|
KM_REISSUE_GOODS: "kmSystemOrderNo",
|
|
25
|
-
JY_REISSUE_GOODS: "jySystemOrderNo"
|
|
25
|
+
JY_REISSUE_GOODS: "jySystemOrderNo",
|
|
26
|
+
JKY_REISSUE_GOODS: "jkySystemOrderNo"
|
|
26
27
|
};
|
|
27
28
|
var SystemOrderNo = /*#__PURE__*/_createClass(function SystemOrderNo(options) {
|
|
28
29
|
var _this = this;
|
|
@@ -133,6 +133,41 @@ var typeMap = {
|
|
|
133
133
|
idKey: "systemOrderId",
|
|
134
134
|
failValue: "失败",
|
|
135
135
|
dataType: "array_object"
|
|
136
|
+
},
|
|
137
|
+
JKY_WAREHOUSING_STATUS: {
|
|
138
|
+
options: [{
|
|
139
|
+
value: "0",
|
|
140
|
+
label: "未收货",
|
|
141
|
+
color: "#ff4d4f"
|
|
142
|
+
}, {
|
|
143
|
+
value: "1",
|
|
144
|
+
label: "部分收货",
|
|
145
|
+
color: "#e7780f"
|
|
146
|
+
}, {
|
|
147
|
+
value: "2",
|
|
148
|
+
label: "收货完成",
|
|
149
|
+
color: "#52c41a"
|
|
150
|
+
}, {
|
|
151
|
+
label: "收货完成-少收",
|
|
152
|
+
value: "3",
|
|
153
|
+
color: "#e7780f"
|
|
154
|
+
}, {
|
|
155
|
+
label: "收货完成-超收",
|
|
156
|
+
value: "4",
|
|
157
|
+
color: "#e7780f"
|
|
158
|
+
}, {
|
|
159
|
+
label: "无需收货",
|
|
160
|
+
value: "5",
|
|
161
|
+
color: "#52c41a"
|
|
162
|
+
}],
|
|
163
|
+
key: "jkyInStockStatusItemList",
|
|
164
|
+
code: "jkyInStockStatusList",
|
|
165
|
+
name: "商品入库状态(勿填)",
|
|
166
|
+
type: 2,
|
|
167
|
+
valueKey: "status",
|
|
168
|
+
idKey: "systemOrderId",
|
|
169
|
+
failValue: "失败",
|
|
170
|
+
dataType: "array_object"
|
|
136
171
|
}
|
|
137
172
|
};
|
|
138
173
|
var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(options) {
|
|
@@ -235,11 +270,11 @@ var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(opt
|
|
|
235
270
|
_defineProperty(this, "filterConfig", function (item) {
|
|
236
271
|
var _typeMap$_this$type19, _item$templateConfig;
|
|
237
272
|
return {
|
|
238
|
-
searchDefaultConditions: ["BS_E3_WAREHOUSING_STATUS", "WAREHOUSING_STATUS", "WDT_WAREHOUSING_STATUS"].includes(_this.type) ? SYMBOL.in : SYMBOL.like,
|
|
273
|
+
searchDefaultConditions: ["BS_E3_WAREHOUSING_STATUS", "WAREHOUSING_STATUS", "WDT_WAREHOUSING_STATUS", "JKY_WAREHOUSING_STATUS"].includes(_this.type) ? SYMBOL.in : SYMBOL.like,
|
|
239
274
|
type: item.type,
|
|
240
275
|
id: "".concat(item.id, "_").concat((_typeMap$_this$type19 = typeMap[_this.type]) === null || _typeMap$_this$type19 === void 0 ? void 0 : _typeMap$_this$type19.code),
|
|
241
276
|
name: "".concat(_this.name),
|
|
242
|
-
filterComponentType: ["BS_E3_WAREHOUSING_STATUS", "WAREHOUSING_STATUS", "WDT_WAREHOUSING_STATUS"].includes(_this.type) ? "MultipleSelect" : "SelectInput",
|
|
277
|
+
filterComponentType: ["BS_E3_WAREHOUSING_STATUS", "WAREHOUSING_STATUS", "WDT_WAREHOUSING_STATUS", "JKY_WAREHOUSING_STATUS"].includes(_this.type) ? "MultipleSelect" : "SelectInput",
|
|
243
278
|
props: {
|
|
244
279
|
options: item === null || item === void 0 ? void 0 : (_item$templateConfig = item.templateConfig) === null || _item$templateConfig === void 0 ? void 0 : _item$templateConfig.reasonList,
|
|
245
280
|
fieldNames: {
|
|
@@ -254,7 +289,7 @@ var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(opt
|
|
|
254
289
|
return _filterFn.filterSplitComma(_filterFn.filterTableListItemColumnValue(i, item.id, (_typeMap$_this$type20 = typeMap[_this.type]) === null || _typeMap$_this$type20 === void 0 ? void 0 : _typeMap$_this$type20.code), value);
|
|
255
290
|
};
|
|
256
291
|
},
|
|
257
|
-
formatFilterValue: ["BS_E3_WAREHOUSING_STATUS", "WAREHOUSING_STATUS", "WDT_WAREHOUSING_STATUS"].includes(_this.type) ? null : function (value) {
|
|
292
|
+
formatFilterValue: ["BS_E3_WAREHOUSING_STATUS", "WAREHOUSING_STATUS", "WDT_WAREHOUSING_STATUS", "JKY_WAREHOUSING_STATUS"].includes(_this.type) ? null : function (value) {
|
|
258
293
|
if (value.type === "in") {
|
|
259
294
|
return value.keywords;
|
|
260
295
|
} else {
|
|
@@ -113,6 +113,7 @@ function Logistics(options) {
|
|
|
113
113
|
name: _this.id,
|
|
114
114
|
rules: _this.rules,
|
|
115
115
|
hidden: p === null || p === void 0 ? void 0 : p.hidden,
|
|
116
|
+
display: p === null || p === void 0 ? void 0 : p.display,
|
|
116
117
|
required: (_this$componentConfig = (_this$componentConfig2 = _this.componentConfig) === null || _this$componentConfig2 === void 0 ? void 0 : _this$componentConfig2.required) !== null && _this$componentConfig !== void 0 ? _this$componentConfig : false,
|
|
117
118
|
tooltip: (_this$componentConfig3 = _this.componentConfig) !== null && _this$componentConfig3 !== void 0 && _this$componentConfig3.showTooltip ? (_this$componentConfig4 = _this.componentConfig) === null || _this$componentConfig4 === void 0 ? void 0 : _this$componentConfig4.tooltip : "",
|
|
118
119
|
component: /*#__PURE__*/React.createElement(LogisticsMoreInterception, _extends({}, _this.componentConfig, {
|
|
@@ -92,6 +92,24 @@ var typeMap = {
|
|
|
92
92
|
}
|
|
93
93
|
return Promise.resolve();
|
|
94
94
|
}
|
|
95
|
+
},
|
|
96
|
+
JKY_REISSUE_GOODS: {
|
|
97
|
+
key: "jkyReissueGoods",
|
|
98
|
+
typeName: "jkyReissueType",
|
|
99
|
+
remark: "jkyReissueType_memo",
|
|
100
|
+
systemOrderNo: "jkySystemOrderNo",
|
|
101
|
+
systemOrderBillType: "jkySystemOrderBillType",
|
|
102
|
+
errMsg: "请选择吉客云补发商品",
|
|
103
|
+
name: "吉客云",
|
|
104
|
+
compType: "补发",
|
|
105
|
+
validator: function validator(_rule, value, type) {
|
|
106
|
+
if (!_rule.required) return Promise.resolve();
|
|
107
|
+
var validatorFlag = erpFormValidator(_rule, value, type);
|
|
108
|
+
if (validatorFlag) {
|
|
109
|
+
return validatorFlag;
|
|
110
|
+
}
|
|
111
|
+
return Promise.resolve();
|
|
112
|
+
}
|
|
95
113
|
}
|
|
96
114
|
};
|
|
97
115
|
var PublicReissue = /*#__PURE__*/_createClass(function PublicReissue(options) {
|
package/dist/esm/factory.d.ts
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { ReissueLogistics, JstItemSelect, JstSupply, JstSendGood, BasicInput, BasicAddress, BasicCascader, BasicCheckbox, BasicDataTime, BasicSelect, BasicRadio, BasicTextArea, BasicPicture, BasicPicturePro, BasicMultSelect, BasicGrade, BasicRate, BasicFile, BasicPosting, SubForm, CommonDataTime, TradeId, ShopName, BuyerNick, ReceiverName, ReceiverMobile, ReceiverAddress, TradeDateTime, Logistics, ReturnLogistics, ActualPayment, ERemark, AliPay, ItemSelect, ItemId, ItemEnCode, SystemOrderNo, Ordinary, ThirdItemSelect, FlowStatusSelect, FlowMarkSelect, FlowTag, Payment, TemplateSelect, WorkOrderId, PlatForm, ShopInput, Submitter, PrevSubmitter, FlowCreator, Handler, CompletedUser, LogisticsInterception, LogisticsMoreInterception, LogisticsTrajectory, LogisticsMoreTrajectory, FlowWorkOrderId, BsGoods, BsExchange, BsReissue, BsReturn, BsSystemOrder, BsLogistics, StatusSelect, CommonSystemOrder, CommonMultiStatus, Calculation, NodeDeadLine, HandlerDeadLine, NodeStayDuration, WlnGoods, BsPosting, MsgStatus, NodeInput, FlowWorkOrderStatus, WdtGoods, WdtReturn, WdtExchange, CommonInput, PaymentVoucherCode, Label, WdtReissue, GyReissue, AfterSalesOrderId, BsE3Goods, PublicGoods, PublicReissueGoods, PublicExchange, GyGoods, BsE3Reissue, MemberLevel, GyReturn, AsyncSelect, WdtShopSelect, KmVideo, BasicTypeInput, SkxIdInputSelect, SkxGoods, BasicSelectOption, OrderSubForm, FlowOverallStatusSelect } from "./index";
|
|
2
2
|
import { PickOption } from "./type";
|
|
3
|
-
export declare const factory: (type: string, options: PickOption) =>
|
|
3
|
+
export declare const factory: (type: string, options: PickOption) => CommonMultiStatus | JstSendGood | MsgStatus | BasicInput | BasicTypeInput | BasicAddress | BasicCascader | BasicCheckbox | BasicDataTime | BasicSelect | BasicSelectOption | BasicRadio | BasicTextArea | BasicPicture | BasicPicturePro | BasicMultSelect | BasicGrade | BasicRate | BasicFile | BasicPosting | SubForm | CommonDataTime | TradeId | ShopName | BuyerNick | ReceiverName | ReceiverMobile | ReceiverAddress | TradeDateTime | Logistics | ReturnLogistics | ActualPayment | ERemark | AliPay | ItemSelect | ItemId | ItemEnCode | SystemOrderNo | Ordinary | ThirdItemSelect | Payment | ReissueLogistics | JstItemSelect | JstSupply | BsSystemOrder | BsGoods | BsE3Goods | PublicGoods | PublicReissueGoods | PublicExchange | BsE3Reissue | BsExchange | BsReissue | BsReturn | BsLogistics | FlowStatusSelect | FlowMarkSelect | FlowTag | TemplateSelect | WorkOrderId | LogisticsInterception | LogisticsMoreInterception | LogisticsTrajectory | LogisticsMoreTrajectory | PlatForm | ShopInput | Submitter | PrevSubmitter | FlowCreator | Handler | CompletedUser | FlowWorkOrderId | StatusSelect | Calculation | CommonSystemOrder | NodeDeadLine | HandlerDeadLine | NodeStayDuration | WlnGoods | BsPosting | NodeInput | FlowWorkOrderStatus | WdtGoods | WdtReissue | WdtReturn | WdtExchange | WdtShopSelect | KmVideo | CommonInput | PaymentVoucherCode | Label | MemberLevel | AfterSalesOrderId | GyGoods | GyReissue | GyReturn | AsyncSelect | SkxIdInputSelect | SkxGoods | OrderSubForm | FlowOverallStatusSelect;
|
package/dist/esm/factory.js
CHANGED
|
@@ -176,6 +176,7 @@ export var factory = function factory(type, options) {
|
|
|
176
176
|
case "JST_REISSUE_GOODS":
|
|
177
177
|
case "KM_REISSUE_GOODS":
|
|
178
178
|
case "JY_REISSUE_GOODS":
|
|
179
|
+
case "JKY_REISSUE_GOODS":
|
|
179
180
|
return new PublicReissueGoods(options);
|
|
180
181
|
case "BS_E3_REISSUE_GOODS":
|
|
181
182
|
return new BsE3Reissue(options);
|
|
@@ -239,6 +240,7 @@ export var factory = function factory(type, options) {
|
|
|
239
240
|
case "WAREHOUSING_STATUS":
|
|
240
241
|
case "BS_E3_WAREHOUSING_STATUS":
|
|
241
242
|
case "WDT_WAREHOUSING_STATUS":
|
|
243
|
+
case "JKY_WAREHOUSING_STATUS":
|
|
242
244
|
return new CommonMultiStatus(options);
|
|
243
245
|
case "MSG_STATUS":
|
|
244
246
|
return new MsgStatus(options);
|
package/dist/esm/service/api.js
CHANGED
|
@@ -303,6 +303,7 @@ export var queryJYLogisticsCompany = function queryJYLogisticsCompany() {
|
|
|
303
303
|
};
|
|
304
304
|
export var queryJKYLogisticsCompany = function queryJKYLogisticsCompany() {
|
|
305
305
|
var instance = ExpressData.getInstance("jky");
|
|
306
|
+
console.log("queryJKYLogisticsCompany");
|
|
306
307
|
return servers.JKY.getLogisticsDataAsync().then(function (data) {
|
|
307
308
|
instance.expressData = data;
|
|
308
309
|
}).catch(console.log);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kmkf-fe-packages/services-components",
|
|
3
|
-
"version": "2.2.44-beta.
|
|
3
|
+
"version": "2.2.44-beta.30",
|
|
4
4
|
"module": "dist/esm/index.js",
|
|
5
5
|
"typings": "dist/esm/index.d.ts",
|
|
6
6
|
"files": [
|
|
@@ -21,8 +21,8 @@
|
|
|
21
21
|
]
|
|
22
22
|
},
|
|
23
23
|
"dependencies": {
|
|
24
|
-
"@kmkf-fe-packages/basic-components": "2.2.44-beta.
|
|
25
|
-
"@kmkf-fe-packages/kmkf-utils": "2.2.44-beta.
|
|
24
|
+
"@kmkf-fe-packages/basic-components": "2.2.44-beta.30",
|
|
25
|
+
"@kmkf-fe-packages/kmkf-utils": "2.2.44-beta.30",
|
|
26
26
|
"b64-to-blob": "^1.2.19",
|
|
27
27
|
"html2canvas": "^1.4.1",
|
|
28
28
|
"react-pdf-js": "^5.1.0"
|
|
@@ -41,7 +41,7 @@
|
|
|
41
41
|
"publishConfig": {
|
|
42
42
|
"access": "public"
|
|
43
43
|
},
|
|
44
|
-
"gitHead": "
|
|
44
|
+
"gitHead": "03fafd04703ba41a459dcab586efa0fbb4e27af5",
|
|
45
45
|
"gitHooks": {
|
|
46
46
|
"pre-commit": "lint-staged"
|
|
47
47
|
}
|