@kmkf-fe-packages/services-components 2.2.11 → 2.2.13-beta.0
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/README.md +1 -1
- package/dist/esm/Hooks/useColumnsConfig.d.ts +1 -1
- 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/useGetErpLogisticsCompany.js +13 -12
- package/dist/esm/commonComponents/GlobalContext/orderQuery/useGetErpSendData.js +10 -9
- package/dist/esm/commonComponents/ShopList/index.js +3 -1
- package/dist/esm/components/BS/BsLogistics/index.js +9 -0
- package/dist/esm/components/BS/BsSystemOrder/index.js +3 -2
- package/dist/esm/components/BS/common/expressCode.js +4 -2
- package/dist/esm/components/BS/common/expressCompany.js +3 -0
- package/dist/esm/components/Common/constants/columnsBaseInfoMap.js +4 -2
- package/dist/esm/components/Common/index.js +5 -3
- package/dist/esm/components/CommonHeaderGood/index.js +216 -6
- package/dist/esm/components/File/index.d.ts +6 -6
- package/dist/esm/components/File/index.js +9 -9
- package/dist/esm/components/JST/JstSendGood/index.js +9 -1
- package/dist/esm/components/KmErpSendGood/index.js +1 -1
- package/dist/esm/components/LogisticsInterception/index.d.ts +20 -0
- package/dist/esm/components/LogisticsInterception/index.js +10 -5
- package/dist/esm/components/LogisticsInterception/interceptApiStatusReason.d.ts +45 -0
- package/dist/esm/components/LogisticsInterception/interceptApiStatusReason.js +97 -0
- package/dist/esm/components/MsgStatus/index.js +6 -1
- package/dist/esm/components/OrderSubForm/index.js +4 -1
- package/dist/esm/components/Payment/PaymentAmount.d.ts +0 -1
- package/dist/esm/components/Payment/PaymentAmount.js +0 -4
- package/dist/esm/components/Public/Goods/index.d.ts +3 -0
- package/dist/esm/components/Public/Goods/index.js +3 -0
- package/dist/esm/components/SubForm/children/HeaderChildFile.d.ts +30 -0
- package/dist/esm/components/SubForm/children/HeaderChildFile.js +117 -0
- package/dist/esm/components/SubForm/children/HeaderChildPic.d.ts +30 -0
- package/dist/esm/components/SubForm/children/HeaderChildPic.js +116 -0
- package/dist/esm/components/SubForm/index.js +86 -6
- package/dist/esm/factory.d.ts +1 -1
- package/dist/esm/factory.js +4 -0
- package/dist/esm/service/api.d.ts +1 -0
- package/dist/esm/service/api.js +6 -0
- package/package.json +3 -3
package/README.md
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import LogisticsInterception from "../components/LogisticsInterception";
|
|
2
2
|
import LogisticsMoreInterception from "../components/LogisticsMoreInterception";
|
|
3
|
-
export declare const newRenderColumnItem: (effects: any) => (item: any) => import("../components/BS/BsLogistics").default | import("../components/
|
|
3
|
+
export declare const newRenderColumnItem: (effects: any) => (item: any) => import("../components/BS/BsLogistics").default | import("../components/TradeId").default | import("../components/Input").default | import("../components/TypeInput").default | import("../components/Address").default | import("../components/Cascader").default | import("../components/Checkbox").default | import("../components/DataTime").default | import("../components/Select").default | import("../components/SelectOption").default | import("../components/Radio").default | import("../components/TextArea").default | import("../components/Picture").default | import("../components/PicturePro").default | import("../components/MultSelect").default | import("../components/Grade").default | import("../components/Rate").default | import("../components/File").default | import("../components/PostIng").default | import("../components/SubForm").default | import("../components/CommonDataTime").default | import("../components/ShopName").default | import("../components/BuyerNick").default | import("../components/ReceiverName").default | import("../components/ReceiverMobile").default | import("../components/ReceiverAddress").default | import("../components/TradeDateTime").default | import("../components/Logistics").default | import("../components/ReturnLogistics").default | import("../components/ActualPayment").default | import("../components/Remark").default | import("../components/Alipay").default | import("../components/EItemSelect").default | import("../components/EItemId").default | import("../components/EItemEnCode").default | import("../components/SystemOrderNo").default | import("../components/Ordinary").default | import("../components/ThirdItemSelect").default | import("../components/Payment").default | import("../components/Reissue/Logistics").default | import("../components/JST/JstItemSelect").default | import("../components/JST/JstSendGood").default | import("../components/JST/JstSupply").default | import("../components/BS/BsSystemOrder").default | import("../components/BS/BsGoods").default | import("../components/BsE3/BsGoods").default | import("../components/Public/Goods").default | import("../components/Public/ReissueGoods").default | import("../components/Public/Exchange").default | import("../components/BsE3/BsReissueE3").default | import("../components/BS/BsExchange").default | import("../components/BS/BsReissue").default | import("../components/BS/BsReturn").default | import("../components/FlowStatusSelect").default | import("../components/FlowMarkSelect").default | import("../components/FlowTag").default | import("../components/TemplateSelect").default | import("../components/WorkOrderId").default | LogisticsInterception | LogisticsMoreInterception | import("../components/LogisticsTrajectory").default | import("../components/LogisticsMoreTrajectory").default | import("../components/PlatForm").default | import("../components/ShopInput").default | import("../components/Submitter").default | import("../components/PrevSubmitter").default | import("../components/FlowCreator").default | import("../components/Handler").default | import("../components/CompletedUser").default | import("../components/FlowWorkOrderId").default | import("../components/StatusSelect").default | import("../components/Calculation").default | import("../components/CommonSystemOrder").default | import("../components/CommonMultiStatus").default | import("../components/NodeDeadLine").default | import("../components/HandlerDeadLine").default | import("../components/NodeStayDuration").default | import("../components/WLN/WlnGoods").default | import("../components/BS/BsPosting").default | import("../components/NodeInput").default | import("../components/FlowWorkOrderStatus").default | import("../components/MsgStatus").default | import("../components/WDT/WdtGoods").default | import("../components/WDT/WdtRessuie").default | import("../components/WDT/WdtReturn").default | import("../components/WDT/WdtExchange").default | import("../components/WDT/WdtShopSelect").default | import("../components/KM/KmVideo").default | import("../components/CommonInput").default | import("../components/PaymentVoucherCode").default | import("../components/Label").default | import("../components/MemberLevel").default | import("../components/AfterSalesOrderId").default | import("../components/GY/GyGoods").default | import("../components/GY/GyReissue").default | import("../components/GY/GyReturn").default | import("../components/Public/AsyncSelect").default | import("../components/SKX/SkxIdInputSelect").default | import("../components/SKX/SkxGoods").default | import("../components/OrderSubForm").default;
|
|
4
4
|
export declare const useColumnsConfig: ({ queryWorkOrderDetail, flatTemplateList, shopList, sortState, onChangeSort, handleReset, handleSubmit, handleChangeSingleWorkOrderMark, userList, tbAppKey, isShare, openSingleColumnsFilter, openSingleColumnsSort, }: {
|
|
5
5
|
queryWorkOrderDetail?: ((p: any) => void) | undefined;
|
|
6
6
|
flatTemplateList?: any;
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
declare type HasErpDataKeyType = "hasWln" | "hasWdt" | "hasBs" | "hasE3" | "hasJst" | "hasGy";
|
|
1
|
+
declare type HasErpDataKeyType = "hasWln" | "hasWdt" | "hasBs" | "hasE3" | "hasJst" | "hasGy" | "hasJy";
|
|
2
2
|
declare function useGetHasErpData(reduxData: any): Record<HasErpDataKeyType, boolean>;
|
|
3
3
|
export default useGetHasErpData;
|
|
@@ -6,14 +6,15 @@ 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;
|
|
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;
|
|
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,
|
|
13
13
|
hasBs: (_companyUserConfig$pl7 = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : (_companyUserConfig$pl8 = companyUserConfig.plugins) === null || _companyUserConfig$pl8 === void 0 ? void 0 : (_companyUserConfig$pl9 = _companyUserConfig$pl8.bs) === null || _companyUserConfig$pl9 === void 0 ? void 0 : _companyUserConfig$pl9.show) !== null && _companyUserConfig$pl7 !== void 0 ? _companyUserConfig$pl7 : false,
|
|
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
|
-
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
|
|
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.jy) === null || _companyUserConfig$pl21 === void 0 ? void 0 : _companyUserConfig$pl21.show) !== null && _companyUserConfig$pl19 !== void 0 ? _companyUserConfig$pl19 : false
|
|
17
18
|
});
|
|
18
19
|
};
|
|
19
20
|
function useGetHasErpData(reduxData) {
|
|
@@ -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 } from "../../../service/api";
|
|
13
|
+
import { queryWdtLogisticsCompany, queryBsE3LogisticsCompany, queryJSTLogisticsCompany, queryWLNLogisticsCompany, queryGYLogisticsCompany, queryJYLogisticsCompany } from "../../../service/api";
|
|
14
14
|
function useGetErpLogisticsCompany(reduxData, notJudgedErp) {
|
|
15
15
|
var _useState = useState("loading"),
|
|
16
16
|
_useState2 = _slicedToArray(_useState, 2),
|
|
@@ -22,38 +22,39 @@ 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, promises;
|
|
25
|
+
var hasWdt, hasE3, hasJst, hasWln, hasGy, hasJy, 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;
|
|
32
|
+
hasWdt = hasErpData.hasWdt, hasE3 = hasErpData.hasE3, hasJst = hasErpData.hasJst, hasWln = hasErpData.hasWln, hasGy = hasErpData.hasGy, hasJy = hasErpData.hasJy;
|
|
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
38
|
if (hasGy || notJudgedErp) promises.push(queryGYLogisticsCompany);
|
|
39
|
-
|
|
40
|
-
_context.
|
|
39
|
+
if (hasJy || notJudgedErp) promises.push(queryJYLogisticsCompany);
|
|
40
|
+
_context.prev = 9;
|
|
41
|
+
_context.next = 12;
|
|
41
42
|
return Promise.all(promises.map(function (promise) {
|
|
42
43
|
return promise();
|
|
43
44
|
}));
|
|
44
|
-
case
|
|
45
|
+
case 12:
|
|
45
46
|
setGlobalState("success");
|
|
46
|
-
_context.next =
|
|
47
|
+
_context.next = 18;
|
|
47
48
|
break;
|
|
48
|
-
case
|
|
49
|
-
_context.prev =
|
|
50
|
-
_context.t0 = _context["catch"](
|
|
49
|
+
case 15:
|
|
50
|
+
_context.prev = 15;
|
|
51
|
+
_context.t0 = _context["catch"](9);
|
|
51
52
|
setGlobalState("failed");
|
|
52
|
-
case
|
|
53
|
+
case 18:
|
|
53
54
|
case "end":
|
|
54
55
|
return _context.stop();
|
|
55
56
|
}
|
|
56
|
-
}, _callee, null, [[
|
|
57
|
+
}, _callee, null, [[9, 15]]);
|
|
57
58
|
}));
|
|
58
59
|
return function asyncQueryData(_x2, _x3, _x4) {
|
|
59
60
|
return _ref.apply(this, arguments);
|
|
@@ -23,7 +23,7 @@ function useGetErpSendData(reduxData, notJudgedErp) {
|
|
|
23
23
|
}, [hasErpData, notJudgedErp]);
|
|
24
24
|
var asyncQueryData = /*#__PURE__*/function () {
|
|
25
25
|
var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(hasErpData, notJudgedErp, isReload) {
|
|
26
|
-
var hasWdt, hasGy, hasJst, promises;
|
|
26
|
+
var hasWdt, hasGy, hasJst, hasJy, promises;
|
|
27
27
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
28
28
|
while (1) switch (_context.prev = _context.next) {
|
|
29
29
|
case 0:
|
|
@@ -31,28 +31,29 @@ function useGetErpSendData(reduxData, notJudgedErp) {
|
|
|
31
31
|
setGlobalState("loading");
|
|
32
32
|
}
|
|
33
33
|
_context.prev = 1;
|
|
34
|
-
hasWdt = hasErpData.hasWdt, hasGy = hasErpData.hasGy, hasJst = hasErpData.hasJst;
|
|
34
|
+
hasWdt = hasErpData.hasWdt, hasGy = hasErpData.hasGy, hasJst = hasErpData.hasJst, hasJy = hasErpData.hasJy;
|
|
35
35
|
promises = [];
|
|
36
36
|
if (hasWdt || notJudgedErp) promises.push(SendDataCenter.getInstance("wdt").fetchData);
|
|
37
37
|
if (hasGy || notJudgedErp) promises.push(SendDataCenter.getInstance("gy").fetchData);
|
|
38
38
|
if (hasJst || notJudgedErp) promises.push(SendDataCenter.getInstance("jst").fetchData);
|
|
39
|
-
|
|
39
|
+
if (hasJy || notJudgedErp) promises.push(SendDataCenter.getInstance("jy").fetchData);
|
|
40
|
+
_context.next = 10;
|
|
40
41
|
return Promise.all(promises.map(function (promise) {
|
|
41
42
|
return promise();
|
|
42
43
|
}));
|
|
43
|
-
case
|
|
44
|
+
case 10:
|
|
44
45
|
setGlobalState("success");
|
|
45
|
-
_context.next =
|
|
46
|
+
_context.next = 16;
|
|
46
47
|
break;
|
|
47
|
-
case
|
|
48
|
-
_context.prev =
|
|
48
|
+
case 13:
|
|
49
|
+
_context.prev = 13;
|
|
49
50
|
_context.t0 = _context["catch"](1);
|
|
50
51
|
setGlobalState("failed");
|
|
51
|
-
case
|
|
52
|
+
case 16:
|
|
52
53
|
case "end":
|
|
53
54
|
return _context.stop();
|
|
54
55
|
}
|
|
55
|
-
}, _callee, null, [[1,
|
|
56
|
+
}, _callee, null, [[1, 13]]);
|
|
56
57
|
}));
|
|
57
58
|
return function asyncQueryData(_x2, _x3, _x4) {
|
|
58
59
|
return _ref.apply(this, arguments);
|
|
@@ -30,8 +30,10 @@ var ShopList = function ShopList(_ref) {
|
|
|
30
30
|
var plat = (_platDatInstance$getP = platDatInstance.getPlatData()) === null || _platDatInstance$getP === void 0 ? void 0 : _platDatInstance$getP.find(function (plat) {
|
|
31
31
|
return plat.platformType === item.shopSource;
|
|
32
32
|
});
|
|
33
|
+
var shopName = plat !== null && plat !== void 0 && plat.platformName ? "\u3010".concat(plat === null || plat === void 0 ? void 0 : plat.platformName, "\u3011").concat(item.shopName) : item.shopName;
|
|
33
34
|
return /*#__PURE__*/React.createElement(Select.Option, {
|
|
34
35
|
disabled: item.disabled || disabledList.includes(item === null || item === void 0 ? void 0 : item[valueMapping]),
|
|
36
|
+
title: "".concat((plat === null || plat === void 0 ? void 0 : plat.platformName) || "").concat(item.shopName),
|
|
35
37
|
value: item === null || item === void 0 ? void 0 : item[valueMapping],
|
|
36
38
|
key: item === null || item === void 0 ? void 0 : item[valueMapping],
|
|
37
39
|
label: "".concat((plat === null || plat === void 0 ? void 0 : plat.platformName) || "").concat(item.shopName)
|
|
@@ -40,7 +42,7 @@ var ShopList = function ShopList(_ref) {
|
|
|
40
42
|
marginRight: 5
|
|
41
43
|
},
|
|
42
44
|
type: item.shopSource
|
|
43
|
-
}), /*#__PURE__*/React.createElement("span", null,
|
|
45
|
+
}), /*#__PURE__*/React.createElement("span", null, shopName));
|
|
44
46
|
}));
|
|
45
47
|
};
|
|
46
48
|
export default ShopList;
|
|
@@ -82,6 +82,15 @@ var typeMap = {
|
|
|
82
82
|
companyDataType: "arrayObject",
|
|
83
83
|
companyCodeType: "arrayObject"
|
|
84
84
|
},
|
|
85
|
+
JY_LOGISTICS: {
|
|
86
|
+
key: "jyLogisticsList",
|
|
87
|
+
name: "巨益",
|
|
88
|
+
company: "jyLogisticsCompany",
|
|
89
|
+
code: "jyLogisticsCode",
|
|
90
|
+
platformType: "jy",
|
|
91
|
+
companyDataType: "arrayObject",
|
|
92
|
+
companyCodeType: "arrayObject"
|
|
93
|
+
},
|
|
85
94
|
SKX_LOGISTICS: {
|
|
86
95
|
key: "skxLogisticsList",
|
|
87
96
|
name: "斯凯奇",
|
|
@@ -11,7 +11,7 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
|
|
|
11
11
|
import React from "react";
|
|
12
12
|
import GetFormItem from "../../GetFormItem";
|
|
13
13
|
import ItemView from "../../../commonComponents/ItemView";
|
|
14
|
-
import { isNull, KM_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, BS_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG, JST_SYSTEM_ORDER_CONFIG } from "@kmkf-fe-packages/kmkf-utils";
|
|
14
|
+
import { isNull, KM_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, BS_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG, JST_SYSTEM_ORDER_CONFIG, JY_SYSTEM_ORDER_CONFIG } from "@kmkf-fe-packages/kmkf-utils";
|
|
15
15
|
import { BsSystemOrder as SystemOrder } from "@kmkf-fe-packages/basic-components";
|
|
16
16
|
import { BsSystemOrderTable } from "../../Common";
|
|
17
17
|
import { BsHeaderChild } from "../common/index";
|
|
@@ -23,7 +23,8 @@ var typeMap = {
|
|
|
23
23
|
WDT_SYSTEM_ORDER: WDT_SYSTEM_ORDER_CONFIG,
|
|
24
24
|
BS_E3_SYSTEM_ORDER: BS_E3_SYSTEM_ORDER_CONFIG,
|
|
25
25
|
GY_SYSTEM_ORDER: GY_SYSTEM_ORDER_CONFIG,
|
|
26
|
-
JST_SYSTEM_ORDER: JST_SYSTEM_ORDER_CONFIG
|
|
26
|
+
JST_SYSTEM_ORDER: JST_SYSTEM_ORDER_CONFIG,
|
|
27
|
+
JY_SYSTEM_ORDER: JY_SYSTEM_ORDER_CONFIG
|
|
27
28
|
};
|
|
28
29
|
var BsSystemOrder = /*#__PURE__*/_createClass(function BsSystemOrder(options) {
|
|
29
30
|
var _this = this,
|
|
@@ -37,6 +37,9 @@ var typeMap = {
|
|
|
37
37
|
GY_LOGISTICS: {
|
|
38
38
|
key: "gyLogisticsItem"
|
|
39
39
|
},
|
|
40
|
+
JY_LOGISTICS: {
|
|
41
|
+
key: "jyLogisticsItem"
|
|
42
|
+
},
|
|
40
43
|
SKX_LOGISTICS: {
|
|
41
44
|
key: "skxLogisticsItem"
|
|
42
45
|
},
|
|
@@ -77,8 +80,7 @@ var ExpressCode = /*#__PURE__*/_createClass(function ExpressCode(options) {
|
|
|
77
80
|
}
|
|
78
81
|
return /*#__PURE__*/React.createElement(BsExpressRender, {
|
|
79
82
|
list: record === null || record === void 0 ? void 0 : record["".concat(key, "_").concat(parentKey, "_").concat(typeMap[_this.type].key)],
|
|
80
|
-
showField: "code"
|
|
81
|
-
logisticsCompanyFormType: _this.logisticsCompanyFormType || "select"
|
|
83
|
+
showField: "code"
|
|
82
84
|
});
|
|
83
85
|
});
|
|
84
86
|
_defineProperty(this, "renderLog", function (r) {
|
|
@@ -7,13 +7,13 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
|
|
|
7
7
|
import system from "./system";
|
|
8
8
|
import bs_e3 from "./bs_e3";
|
|
9
9
|
import bs from "./bs";
|
|
10
|
-
import { getJstColumns, getWlnColumns, getGyColumns, getWdtColumns, getKmColumns, getSkxColumns } from "@kmkf-fe-packages/basic-components";
|
|
10
|
+
import { getJstColumns, getWlnColumns, getGyColumns, getWdtColumns, getKmColumns, getJyColumns, getSkxColumns } from "@kmkf-fe-packages/basic-components";
|
|
11
11
|
import defaultColumns from "./defaultColumns";
|
|
12
12
|
export var getColumnsMap = function getColumnsMap(args) {
|
|
13
13
|
var _ref = args || {},
|
|
14
14
|
_ref$text = _ref.text,
|
|
15
15
|
text = _ref$text === void 0 ? "" : _ref$text;
|
|
16
|
-
return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, system()), bs({
|
|
16
|
+
return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, system()), bs({
|
|
17
17
|
text: text
|
|
18
18
|
})), bs_e3()), getWdtColumns({
|
|
19
19
|
text: text,
|
|
@@ -26,6 +26,8 @@ export var getColumnsMap = function getColumnsMap(args) {
|
|
|
26
26
|
text: text
|
|
27
27
|
})), getKmColumns({
|
|
28
28
|
disabled: true
|
|
29
|
+
})), getJyColumns({
|
|
30
|
+
disabled: true
|
|
29
31
|
})), getSkxColumns({})), {}, {
|
|
30
32
|
default: defaultColumns({
|
|
31
33
|
text: text
|
|
@@ -21,7 +21,7 @@ import { CopyToClipboard } from "react-copy-to-clipboard";
|
|
|
21
21
|
import styles from "./index.module.less";
|
|
22
22
|
import defaultImg from "./img/default-img.png";
|
|
23
23
|
import CopyText from "../../commonComponents/CopyText";
|
|
24
|
-
import { KM_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, BS_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG, JST_SYSTEM_ORDER_CONFIG, msgTypeCh, getMapping, columnsGoodsList } from "@kmkf-fe-packages/kmkf-utils";
|
|
24
|
+
import { KM_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, BS_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG, JST_SYSTEM_ORDER_CONFIG, JY_SYSTEM_ORDER_CONFIG, msgTypeCh, getMapping, columnsGoodsList } from "@kmkf-fe-packages/kmkf-utils";
|
|
25
25
|
import { getColumnsMap } from "./constants/columnsBaseInfoMap";
|
|
26
26
|
import { VideoCameraTwoTone } from "@ant-design/icons";
|
|
27
27
|
var Paragraph = Typography.Paragraph;
|
|
@@ -776,7 +776,8 @@ export var BsSystemOrderTable = function BsSystemOrderTable(_ref14) {
|
|
|
776
776
|
WDT_SYSTEM_ORDER: WDT_SYSTEM_ORDER_CONFIG.columns,
|
|
777
777
|
BS_E3_SYSTEM_ORDER: BS_E3_SYSTEM_ORDER_CONFIG.columns,
|
|
778
778
|
GY_SYSTEM_ORDER: GY_SYSTEM_ORDER_CONFIG.columns,
|
|
779
|
-
JST_SYSTEM_ORDER: JST_SYSTEM_ORDER_CONFIG.columns
|
|
779
|
+
JST_SYSTEM_ORDER: JST_SYSTEM_ORDER_CONFIG.columns,
|
|
780
|
+
JY_SYSTEM_ORDER: JY_SYSTEM_ORDER_CONFIG.columns
|
|
780
781
|
};
|
|
781
782
|
var rowKeyMap = {
|
|
782
783
|
BS_SYSTEM_ORDER: "billNo",
|
|
@@ -785,7 +786,8 @@ export var BsSystemOrderTable = function BsSystemOrderTable(_ref14) {
|
|
|
785
786
|
WDT_SYSTEM_ORDER: "billNo",
|
|
786
787
|
BS_E3_SYSTEM_ORDER: "orderSn",
|
|
787
788
|
GY_SYSTEM_ORDER: "billNo",
|
|
788
|
-
JST_SYSTEM_ORDER: "oId"
|
|
789
|
+
JST_SYSTEM_ORDER: "oId",
|
|
790
|
+
JY_SYSTEM_ORDER: "tradeNo"
|
|
789
791
|
};
|
|
790
792
|
var rowSelection = {
|
|
791
793
|
selectedRowKeys: (value === null || value === void 0 ? void 0 : value.selectIds) || ((value === null || value === void 0 ? void 0 : value.showOrderInfo) || []).reduce(function (prv, next) {
|
|
@@ -987,11 +987,11 @@ var GoodHeaderMap = {
|
|
|
987
987
|
name: "总金额",
|
|
988
988
|
transformValue: function transformValue(val, record, parentName) {
|
|
989
989
|
if (!record) return "--";
|
|
990
|
-
return (record["".concat(parentName, "_qty")] || 0) * (+record["".concat(parentName, "_salePrice")] || 0);
|
|
990
|
+
return ((record["".concat(parentName, "_qty")] || 0) * (+record["".concat(parentName, "_salePrice")] || 0)).toFixed(2);
|
|
991
991
|
},
|
|
992
992
|
renderExport: function renderExport(val, record, parentName) {
|
|
993
993
|
if (!record) return "--";
|
|
994
|
-
return (record["".concat(parentName, "_qty")] || 0) * (+record["".concat(parentName, "_salePrice")] || 0);
|
|
994
|
+
return ((record["".concat(parentName, "_qty")] || 0) * (+record["".concat(parentName, "_salePrice")] || 0)).toFixed(2);
|
|
995
995
|
}
|
|
996
996
|
},
|
|
997
997
|
batchId: "批次号",
|
|
@@ -1083,11 +1083,11 @@ var GoodHeaderMap = {
|
|
|
1083
1083
|
name: "总金额",
|
|
1084
1084
|
transformValue: function transformValue(val, record, parentName) {
|
|
1085
1085
|
if (!record) return "--";
|
|
1086
|
-
return (record["".concat(parentName, "_qty")] || 0) * (+record["".concat(parentName, "_salePrice")] || 0);
|
|
1086
|
+
return ((record["".concat(parentName, "_qty")] || 0) * (+record["".concat(parentName, "_salePrice")] || 0)).toFixed(2);
|
|
1087
1087
|
},
|
|
1088
1088
|
renderExport: function renderExport(val, record, parentName) {
|
|
1089
1089
|
if (!record) return "--";
|
|
1090
|
-
return (record["".concat(parentName, "_qty")] || 0) * (+record["".concat(parentName, "_salePrice")] || 0);
|
|
1090
|
+
return ((record["".concat(parentName, "_qty")] || 0) * (+record["".concat(parentName, "_salePrice")] || 0)).toFixed(2);
|
|
1091
1091
|
}
|
|
1092
1092
|
},
|
|
1093
1093
|
batchId: "批次号",
|
|
@@ -1353,11 +1353,221 @@ var GoodHeaderMap = {
|
|
|
1353
1353
|
},
|
|
1354
1354
|
moneyKey: "money"
|
|
1355
1355
|
},
|
|
1356
|
+
JY_GOODS: {
|
|
1357
|
+
headerMap: {
|
|
1358
|
+
goodsName: {
|
|
1359
|
+
component: BsHeaderChild,
|
|
1360
|
+
name: "货品名称",
|
|
1361
|
+
key: "goodsName",
|
|
1362
|
+
width: 150
|
|
1363
|
+
},
|
|
1364
|
+
goodsCode: {
|
|
1365
|
+
component: BsHeaderChild,
|
|
1366
|
+
name: "货品编号",
|
|
1367
|
+
key: "goodsCode",
|
|
1368
|
+
width: 200
|
|
1369
|
+
},
|
|
1370
|
+
goodsId: {
|
|
1371
|
+
component: BsHeaderChild,
|
|
1372
|
+
name: "货品ID",
|
|
1373
|
+
key: "goodsId",
|
|
1374
|
+
width: 150
|
|
1375
|
+
},
|
|
1376
|
+
goodsClass: {
|
|
1377
|
+
component: BsHeaderChild,
|
|
1378
|
+
name: "货品分类",
|
|
1379
|
+
key: "goodsClass",
|
|
1380
|
+
width: 150
|
|
1381
|
+
},
|
|
1382
|
+
code: {
|
|
1383
|
+
component: BsHeaderChild,
|
|
1384
|
+
name: "条码",
|
|
1385
|
+
key: "code",
|
|
1386
|
+
width: 150
|
|
1387
|
+
},
|
|
1388
|
+
specName: {
|
|
1389
|
+
component: BsHeaderChild,
|
|
1390
|
+
name: "规格名称",
|
|
1391
|
+
key: "specName",
|
|
1392
|
+
width: 200
|
|
1393
|
+
},
|
|
1394
|
+
specCode: {
|
|
1395
|
+
component: BsHeaderChild,
|
|
1396
|
+
name: "规格编号",
|
|
1397
|
+
key: "specCode",
|
|
1398
|
+
width: 150
|
|
1399
|
+
},
|
|
1400
|
+
specId: {
|
|
1401
|
+
component: BsHeaderChild,
|
|
1402
|
+
name: "规格ID",
|
|
1403
|
+
key: "specId",
|
|
1404
|
+
width: 150
|
|
1405
|
+
},
|
|
1406
|
+
productName: {
|
|
1407
|
+
component: BsHeaderChild,
|
|
1408
|
+
name: "系统商品名称",
|
|
1409
|
+
key: "productName",
|
|
1410
|
+
width: 150
|
|
1411
|
+
},
|
|
1412
|
+
productCode: {
|
|
1413
|
+
component: BsHeaderChild,
|
|
1414
|
+
name: "系统商品编码",
|
|
1415
|
+
key: "productCode",
|
|
1416
|
+
width: 150
|
|
1417
|
+
},
|
|
1418
|
+
productId: {
|
|
1419
|
+
component: BsHeaderChild,
|
|
1420
|
+
name: "系统商品ID",
|
|
1421
|
+
key: "productId",
|
|
1422
|
+
width: 150
|
|
1423
|
+
},
|
|
1424
|
+
skuName: {
|
|
1425
|
+
component: BsHeaderChild,
|
|
1426
|
+
name: "系统规格名称",
|
|
1427
|
+
key: "skuName",
|
|
1428
|
+
width: 150
|
|
1429
|
+
},
|
|
1430
|
+
skuCode: {
|
|
1431
|
+
component: BsHeaderChild,
|
|
1432
|
+
name: "系统规格编码",
|
|
1433
|
+
key: "skuCode",
|
|
1434
|
+
width: 150
|
|
1435
|
+
},
|
|
1436
|
+
mallProductName: {
|
|
1437
|
+
component: BsHeaderChild,
|
|
1438
|
+
name: "平台商品名称",
|
|
1439
|
+
key: "mallProductName",
|
|
1440
|
+
width: 150
|
|
1441
|
+
},
|
|
1442
|
+
mallProductOutCode: {
|
|
1443
|
+
component: BsHeaderChild,
|
|
1444
|
+
name: "平台商品编码",
|
|
1445
|
+
key: "mallProductOutCode",
|
|
1446
|
+
width: 150
|
|
1447
|
+
},
|
|
1448
|
+
mallProductId: {
|
|
1449
|
+
component: BsHeaderChild,
|
|
1450
|
+
name: "平台商品ID",
|
|
1451
|
+
key: "mallProductId",
|
|
1452
|
+
width: 150
|
|
1453
|
+
},
|
|
1454
|
+
mallSkuName: {
|
|
1455
|
+
component: BsHeaderChild,
|
|
1456
|
+
name: "平台规格名称",
|
|
1457
|
+
key: "mallSkuName",
|
|
1458
|
+
width: 150
|
|
1459
|
+
},
|
|
1460
|
+
mallSkuId: {
|
|
1461
|
+
component: BsHeaderChild,
|
|
1462
|
+
name: "平台规格ID",
|
|
1463
|
+
key: "mallSkuId",
|
|
1464
|
+
width: 150
|
|
1465
|
+
},
|
|
1466
|
+
sellcount: {
|
|
1467
|
+
component: BsHeaderChild,
|
|
1468
|
+
name: "数量",
|
|
1469
|
+
key: "sellcount",
|
|
1470
|
+
width: 100
|
|
1471
|
+
},
|
|
1472
|
+
sellPrice: {
|
|
1473
|
+
component: BsHeaderChild,
|
|
1474
|
+
name: "单价",
|
|
1475
|
+
key: "sellPrice",
|
|
1476
|
+
width: 150
|
|
1477
|
+
},
|
|
1478
|
+
mallSellingPrice: {
|
|
1479
|
+
component: BsHeaderChild,
|
|
1480
|
+
name: "平台商品价格",
|
|
1481
|
+
key: "mallSellingPrice",
|
|
1482
|
+
width: 150
|
|
1483
|
+
},
|
|
1484
|
+
sellTotal: {
|
|
1485
|
+
component: BsHeaderChild,
|
|
1486
|
+
name: "金额",
|
|
1487
|
+
key: "sellTotal",
|
|
1488
|
+
width: 150
|
|
1489
|
+
},
|
|
1490
|
+
settlementPrice: {
|
|
1491
|
+
component: BsHeaderChild,
|
|
1492
|
+
name: "结算价",
|
|
1493
|
+
key: "settlementPrice",
|
|
1494
|
+
width: 150
|
|
1495
|
+
},
|
|
1496
|
+
divideOrderFee: {
|
|
1497
|
+
component: BsHeaderChild,
|
|
1498
|
+
name: "分摊实付金额",
|
|
1499
|
+
key: "divideOrderFee",
|
|
1500
|
+
width: 150
|
|
1501
|
+
},
|
|
1502
|
+
bfit: {
|
|
1503
|
+
component: BsHeaderChild,
|
|
1504
|
+
name: "是否组合装",
|
|
1505
|
+
key: "bfit",
|
|
1506
|
+
width: 150
|
|
1507
|
+
},
|
|
1508
|
+
combinationName: {
|
|
1509
|
+
component: BsHeaderChild,
|
|
1510
|
+
name: "组合商品名称",
|
|
1511
|
+
key: "combinationName",
|
|
1512
|
+
width: 150
|
|
1513
|
+
},
|
|
1514
|
+
combinationCode: {
|
|
1515
|
+
component: BsHeaderChild,
|
|
1516
|
+
name: "组合商品编码",
|
|
1517
|
+
key: "combinationCode",
|
|
1518
|
+
width: 150
|
|
1519
|
+
},
|
|
1520
|
+
gift: {
|
|
1521
|
+
component: BsHeaderChild,
|
|
1522
|
+
name: "是否赠品",
|
|
1523
|
+
key: "gift",
|
|
1524
|
+
width: 150
|
|
1525
|
+
},
|
|
1526
|
+
skuNote: {
|
|
1527
|
+
component: BsHeaderChild,
|
|
1528
|
+
name: "商品备注",
|
|
1529
|
+
key: "skuNote",
|
|
1530
|
+
width: 150
|
|
1531
|
+
}
|
|
1532
|
+
},
|
|
1533
|
+
itemKey: {
|
|
1534
|
+
goodsName: "货品名称",
|
|
1535
|
+
goodsCode: "货品编号",
|
|
1536
|
+
goodsId: "货品ID",
|
|
1537
|
+
goodsClass: "货品分类",
|
|
1538
|
+
code: "条码",
|
|
1539
|
+
specName: "规格名称",
|
|
1540
|
+
specCode: "规格编号",
|
|
1541
|
+
specId: "规格ID",
|
|
1542
|
+
productName: "系统商品名称",
|
|
1543
|
+
productCode: "系统商品编码",
|
|
1544
|
+
productId: "系统商品ID",
|
|
1545
|
+
skuName: "系统规格名称",
|
|
1546
|
+
skuCode: "系统规格编码",
|
|
1547
|
+
mallProductName: "平台商品名称",
|
|
1548
|
+
mallProductOutCode: "平台商品编码",
|
|
1549
|
+
mallProductId: "平台商品ID",
|
|
1550
|
+
mallSkuName: "平台规格名称",
|
|
1551
|
+
mallSkuId: "平台规格ID",
|
|
1552
|
+
sellcount: "数量",
|
|
1553
|
+
sellPrice: "单价",
|
|
1554
|
+
mallSellingPrice: "平台商品价格",
|
|
1555
|
+
sellTotal: "金额",
|
|
1556
|
+
settlementPrice: "结算价",
|
|
1557
|
+
divideOrderFee: "分摊实付金额",
|
|
1558
|
+
bfit: "是否组合装",
|
|
1559
|
+
combinationName: "组合商品名称",
|
|
1560
|
+
combinationCode: "组合商品编码",
|
|
1561
|
+
gift: "是否赠品",
|
|
1562
|
+
skuNote: "商品备注"
|
|
1563
|
+
},
|
|
1564
|
+
moneyKey: "sellTotal"
|
|
1565
|
+
},
|
|
1356
1566
|
SKX_GOODS: {
|
|
1357
1567
|
headerMap: {
|
|
1358
1568
|
skuEcode: {
|
|
1359
1569
|
name: "[SKX]发货单明细-skuEcode",
|
|
1360
|
-
width:
|
|
1570
|
+
width: 250
|
|
1361
1571
|
},
|
|
1362
1572
|
subOrderId: {
|
|
1363
1573
|
name: "[SKX]发货单-子订单号",
|
|
@@ -1373,7 +1583,7 @@ var GoodHeaderMap = {
|
|
|
1373
1583
|
headerMap: {
|
|
1374
1584
|
returnSkuEcode: {
|
|
1375
1585
|
name: "[SKX]退货单明细-returnSkuEcode",
|
|
1376
|
-
width:
|
|
1586
|
+
width: 300
|
|
1377
1587
|
},
|
|
1378
1588
|
returnSubOrderId: {
|
|
1379
1589
|
name: "[SKX]退货单-子订单号",
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { ComponentInterface, PickOption, Record } from
|
|
2
|
-
import React from
|
|
1
|
+
import { ComponentInterface, PickOption, Record } from '../../type';
|
|
2
|
+
import React from 'react';
|
|
3
3
|
declare class BasicFile implements ComponentInterface {
|
|
4
4
|
name: string;
|
|
5
5
|
id: string;
|
|
@@ -7,14 +7,14 @@ declare class BasicFile implements ComponentInterface {
|
|
|
7
7
|
formField: string;
|
|
8
8
|
type: string;
|
|
9
9
|
rules: any[];
|
|
10
|
-
componentConfig: ComponentInterface[
|
|
10
|
+
componentConfig: ComponentInterface['componentConfig'];
|
|
11
11
|
isCombinationComponent: boolean;
|
|
12
12
|
canSort: boolean;
|
|
13
13
|
children: ComponentInterface[];
|
|
14
|
-
effects: ComponentInterface[
|
|
15
|
-
dataType: ComponentInterface[
|
|
14
|
+
effects: ComponentInterface['effects'];
|
|
15
|
+
dataType: ComponentInterface['dataType'];
|
|
16
16
|
exampleValue?: string;
|
|
17
|
-
standardDateType: ComponentInterface[
|
|
17
|
+
standardDateType: ComponentInterface['standardDateType'];
|
|
18
18
|
constructor(options: PickOption);
|
|
19
19
|
renderPc: (value: any, record: Record) => any;
|
|
20
20
|
renderLog: (r: Record) => any;
|