@kmkf-fe-packages/services-components 2.2.15 → 2.2.16
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/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/components/BS/BsLogistics/index.js +9 -0
- package/dist/esm/components/BS/BsSystemOrder/index.js +3 -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/BS/common/expressCode.js +3 -0
- package/dist/esm/components/BS/common/expressCompany.js +17 -1
- package/dist/esm/components/Common/constants/columnsBaseInfoMap.js +4 -2
- package/dist/esm/components/Common/index.js +9 -6
- package/dist/esm/components/CommonHeaderGood/index.js +434 -0
- package/dist/esm/components/GY/GyGoods/index.js +3 -1
- package/dist/esm/components/GY/GyReissue/index.js +3 -1
- package/dist/esm/components/GY/GyReturn/index.js +3 -1
- package/dist/esm/components/JST/JstSendGood/index.js +9 -1
- package/dist/esm/components/KmErpSendGood/index.js +1 -1
- package/dist/esm/components/Public/Goods/index.d.ts +1 -8
- package/dist/esm/components/Public/Goods/index.js +30 -6
- package/dist/esm/components/Public/ReissueGoods/index.js +18 -0
- package/dist/esm/components/Reissue/Logistics/index.js +2 -2
- package/dist/esm/factory.d.ts +1 -1
- package/dist/esm/factory.js +5 -0
- package/dist/esm/service/api.d.ts +1 -0
- package/dist/esm/service/api.js +6 -0
- package/package.json +4 -4
|
@@ -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/
|
|
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.juYi) === 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);
|
|
@@ -101,6 +101,15 @@ var typeMap = {
|
|
|
101
101
|
companyDataType: "like",
|
|
102
102
|
companyCodeType: "like",
|
|
103
103
|
logisticsCompanyFormType: "input"
|
|
104
|
+
},
|
|
105
|
+
JY_LOGISTICS: {
|
|
106
|
+
key: "jyLogisticsList",
|
|
107
|
+
name: "巨益",
|
|
108
|
+
company: "jyLogisticsCompany",
|
|
109
|
+
code: "jyLogisticsCode",
|
|
110
|
+
platformType: "jy",
|
|
111
|
+
companyDataType: "string",
|
|
112
|
+
companyCodeType: "arrayObject"
|
|
104
113
|
}
|
|
105
114
|
};
|
|
106
115
|
var BsLogistics = /*#__PURE__*/_createClass(function BsLogistics(_options) {
|
|
@@ -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,
|
|
@@ -25,7 +25,8 @@ var componentType = {
|
|
|
25
25
|
GY_RETURN_GOODS: "gyReturnType",
|
|
26
26
|
JST_REISSUE_GOODS: "jstReissueType",
|
|
27
27
|
JST_RETURN_GOODS: "jstReturnType",
|
|
28
|
-
KM_REISSUE_GOODS: "kmReissueType"
|
|
28
|
+
KM_REISSUE_GOODS: "kmReissueType",
|
|
29
|
+
JY_REISSUE_GOODS: "jyReissueType"
|
|
29
30
|
};
|
|
30
31
|
var BsMemo = /*#__PURE__*/_createClass(function BsMemo(options) {
|
|
31
32
|
var _this = this;
|
|
@@ -26,7 +26,8 @@ var componentType = {
|
|
|
26
26
|
GY_RETURN_GOODS: "gyReturnType",
|
|
27
27
|
JST_REISSUE_GOODS: "jstReissueType",
|
|
28
28
|
JST_RETURN_GOODS: "jstReturnType",
|
|
29
|
-
KM_REISSUE_GOODS: "kmReissueType"
|
|
29
|
+
KM_REISSUE_GOODS: "kmReissueType",
|
|
30
|
+
JY_REISSUE_GOODS: "jyReissueType"
|
|
30
31
|
};
|
|
31
32
|
var BsType = /*#__PURE__*/_createClass(function BsType(options) {
|
|
32
33
|
var _this = this;
|
|
@@ -21,7 +21,8 @@ var componentType = {
|
|
|
21
21
|
GY_RETURN_GOODS: "gySystemOrderNo",
|
|
22
22
|
JST_REISSUE_GOODS: "jstSystemOrderNo",
|
|
23
23
|
JST_RETURN_GOODS: "jstSystemOrderNo",
|
|
24
|
-
KM_REISSUE_GOODS: "kmSystemOrderNo"
|
|
24
|
+
KM_REISSUE_GOODS: "kmSystemOrderNo",
|
|
25
|
+
JY_REISSUE_GOODS: "jySystemOrderNo"
|
|
25
26
|
};
|
|
26
27
|
var SystemOrderNo = /*#__PURE__*/_createClass(function SystemOrderNo(options) {
|
|
27
28
|
var _this = this;
|
|
@@ -40,6 +40,9 @@ var typeMap = {
|
|
|
40
40
|
GY_LOGISTICS: {
|
|
41
41
|
key: "gyLogisticsItem"
|
|
42
42
|
},
|
|
43
|
+
JY_LOGISTICS: {
|
|
44
|
+
key: "jyLogisticsItem"
|
|
45
|
+
},
|
|
43
46
|
SKX_LOGISTICS: {
|
|
44
47
|
key: "skxLogisticsItem"
|
|
45
48
|
},
|
|
@@ -98,7 +101,20 @@ var Express = /*#__PURE__*/_createClass(function Express(options) {
|
|
|
98
101
|
});
|
|
99
102
|
_defineProperty(this, "renderExport", function (value, record) {
|
|
100
103
|
var _this$expressDateInst, _this$expressDateInst2;
|
|
101
|
-
|
|
104
|
+
var name = (_this$expressDateInst = _this.expressDateInstance) === null || _this$expressDateInst === void 0 ? void 0 : (_this$expressDateInst2 = _this$expressDateInst.getExpressNameByCode) === null || _this$expressDateInst2 === void 0 ? void 0 : _this$expressDateInst2.call(_this$expressDateInst, record === null || record === void 0 ? void 0 : record["".concat(_this.id)], false);
|
|
105
|
+
if (!name) {
|
|
106
|
+
var _typeMap$_this$type3, _items$find;
|
|
107
|
+
var _this$id$split3 = _this.id.split("_"),
|
|
108
|
+
_this$id$split4 = _slicedToArray(_this$id$split3, 3),
|
|
109
|
+
key = _this$id$split4[0],
|
|
110
|
+
parentKey = _this$id$split4[1],
|
|
111
|
+
childKey = _this$id$split4[2];
|
|
112
|
+
var items = record === null || record === void 0 ? void 0 : record["".concat(key, "_").concat(parentKey, "_").concat((_typeMap$_this$type3 = typeMap[_this.type]) === null || _typeMap$_this$type3 === void 0 ? void 0 : _typeMap$_this$type3.key)];
|
|
113
|
+
name = items === null || items === void 0 ? void 0 : (_items$find = items.find(function (item) {
|
|
114
|
+
return item.logisticsCompany === (record === null || record === void 0 ? void 0 : record["".concat(_this.id)]);
|
|
115
|
+
})) === null || _items$find === void 0 ? void 0 : _items$find.logisticsCompanyName;
|
|
116
|
+
}
|
|
117
|
+
return name || (record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) || "--";
|
|
102
118
|
});
|
|
103
119
|
_defineProperty(this, "editRender", function () {
|
|
104
120
|
return null;
|
|
@@ -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;
|
|
@@ -272,7 +272,7 @@ export var JstGoodImage = function JstGoodImage(_ref6) {
|
|
|
272
272
|
var company = "";
|
|
273
273
|
if (logisticsCompanyFormType === "input") {
|
|
274
274
|
company = logisticsCompany;
|
|
275
|
-
} else if (
|
|
275
|
+
} else if (["gy", "jy"].includes(platformType)) {
|
|
276
276
|
// 管易为了兼容之前的补发物流信息，若不存在logisticsCompanyName值则去匹配物流映射列表展示物流公司名称
|
|
277
277
|
company = ExpressData.getInstance(platformType).getExpressNameByCode(logisticsCompany, false) || logisticsCompanyName;
|
|
278
278
|
} else {
|
|
@@ -305,8 +305,9 @@ export var BsExpressRender = function BsExpressRender(_ref7) {
|
|
|
305
305
|
platformType = _ref7$platformType === void 0 ? "default" : _ref7$platformType,
|
|
306
306
|
logisticsCompanyFormType = _ref7.logisticsCompanyFormType;
|
|
307
307
|
return list !== null && list !== void 0 && list.length ? (list || []).map(function (item, index) {
|
|
308
|
-
var logisticsCompany = item.logisticsCompany
|
|
309
|
-
|
|
308
|
+
var logisticsCompany = item.logisticsCompany,
|
|
309
|
+
logisticsCompanyName = item.logisticsCompanyName;
|
|
310
|
+
var company = logisticsCompanyFormType === "input" ? logisticsCompany : ExpressData.getInstance(platformType).getExpressNameByCode(logisticsCompany, false) || logisticsCompanyName || logisticsCompany;
|
|
310
311
|
return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Popover, {
|
|
311
312
|
content: content(item, index),
|
|
312
313
|
overlayStyle: {
|
|
@@ -776,7 +777,8 @@ export var BsSystemOrderTable = function BsSystemOrderTable(_ref14) {
|
|
|
776
777
|
WDT_SYSTEM_ORDER: WDT_SYSTEM_ORDER_CONFIG.columns,
|
|
777
778
|
BS_E3_SYSTEM_ORDER: BS_E3_SYSTEM_ORDER_CONFIG.columns,
|
|
778
779
|
GY_SYSTEM_ORDER: GY_SYSTEM_ORDER_CONFIG.columns,
|
|
779
|
-
JST_SYSTEM_ORDER: JST_SYSTEM_ORDER_CONFIG.columns
|
|
780
|
+
JST_SYSTEM_ORDER: JST_SYSTEM_ORDER_CONFIG.columns,
|
|
781
|
+
JY_SYSTEM_ORDER: JY_SYSTEM_ORDER_CONFIG.columns
|
|
780
782
|
};
|
|
781
783
|
var rowKeyMap = {
|
|
782
784
|
BS_SYSTEM_ORDER: "billNo",
|
|
@@ -785,7 +787,8 @@ export var BsSystemOrderTable = function BsSystemOrderTable(_ref14) {
|
|
|
785
787
|
WDT_SYSTEM_ORDER: "billNo",
|
|
786
788
|
BS_E3_SYSTEM_ORDER: "orderSn",
|
|
787
789
|
GY_SYSTEM_ORDER: "billNo",
|
|
788
|
-
JST_SYSTEM_ORDER: "oId"
|
|
790
|
+
JST_SYSTEM_ORDER: "oId",
|
|
791
|
+
JY_SYSTEM_ORDER: "tradeNo"
|
|
789
792
|
};
|
|
790
793
|
var rowSelection = {
|
|
791
794
|
selectedRowKeys: (value === null || value === void 0 ? void 0 : value.selectIds) || ((value === null || value === void 0 ? void 0 : value.showOrderInfo) || []).reduce(function (prv, next) {
|
|
@@ -1353,6 +1353,440 @@ var GoodHeaderMap = {
|
|
|
1353
1353
|
},
|
|
1354
1354
|
moneyKey: "money"
|
|
1355
1355
|
},
|
|
1356
|
+
JY_GOODS: {
|
|
1357
|
+
headerMap: {
|
|
1358
|
+
productName: {
|
|
1359
|
+
component: BsHeaderChild,
|
|
1360
|
+
name: "系统商品名称",
|
|
1361
|
+
key: "productName",
|
|
1362
|
+
width: 150
|
|
1363
|
+
},
|
|
1364
|
+
productCode: {
|
|
1365
|
+
component: BsHeaderChild,
|
|
1366
|
+
name: "系统商品编码",
|
|
1367
|
+
key: "productCode",
|
|
1368
|
+
width: 150
|
|
1369
|
+
},
|
|
1370
|
+
productId: {
|
|
1371
|
+
component: BsHeaderChild,
|
|
1372
|
+
name: "系统商品ID",
|
|
1373
|
+
key: "productId",
|
|
1374
|
+
width: 150
|
|
1375
|
+
},
|
|
1376
|
+
skuName: {
|
|
1377
|
+
component: BsHeaderChild,
|
|
1378
|
+
name: "系统规格名称",
|
|
1379
|
+
key: "skuName",
|
|
1380
|
+
width: 150
|
|
1381
|
+
},
|
|
1382
|
+
skuCode: {
|
|
1383
|
+
component: BsHeaderChild,
|
|
1384
|
+
name: "系统规格编码",
|
|
1385
|
+
key: "skuCode",
|
|
1386
|
+
width: 150
|
|
1387
|
+
},
|
|
1388
|
+
specId: {
|
|
1389
|
+
component: BsHeaderChild,
|
|
1390
|
+
name: "规格ID",
|
|
1391
|
+
key: "specId",
|
|
1392
|
+
width: 150
|
|
1393
|
+
},
|
|
1394
|
+
// goodsName: {
|
|
1395
|
+
// component: BsHeaderChild,
|
|
1396
|
+
// name: "货品名称",
|
|
1397
|
+
// key: "goodsName",
|
|
1398
|
+
// width: 250,
|
|
1399
|
+
// },
|
|
1400
|
+
// goodsCode: {
|
|
1401
|
+
// component: BsHeaderChild,
|
|
1402
|
+
// name: "货品编号",
|
|
1403
|
+
// key: "goodsCode",
|
|
1404
|
+
// width: 200,
|
|
1405
|
+
// },
|
|
1406
|
+
// goodsId: {
|
|
1407
|
+
// component: BsHeaderChild,
|
|
1408
|
+
// name: "货品ID",
|
|
1409
|
+
// key: "goodsId",
|
|
1410
|
+
// width: 150,
|
|
1411
|
+
// },
|
|
1412
|
+
goodsClass: {
|
|
1413
|
+
component: BsHeaderChild,
|
|
1414
|
+
name: "货品类别",
|
|
1415
|
+
key: "goodsClass",
|
|
1416
|
+
width: 150
|
|
1417
|
+
},
|
|
1418
|
+
code: {
|
|
1419
|
+
component: BsHeaderChild,
|
|
1420
|
+
name: "条码",
|
|
1421
|
+
key: "code",
|
|
1422
|
+
width: 150
|
|
1423
|
+
},
|
|
1424
|
+
// specName: {
|
|
1425
|
+
// component: BsHeaderChild,
|
|
1426
|
+
// name: "规格名称",
|
|
1427
|
+
// key: "specName",
|
|
1428
|
+
// width: 200,
|
|
1429
|
+
// },
|
|
1430
|
+
// specCode: {
|
|
1431
|
+
// component: BsHeaderChild,
|
|
1432
|
+
// name: "规格编号",
|
|
1433
|
+
// key: "specCode",
|
|
1434
|
+
// width: 150,
|
|
1435
|
+
// },
|
|
1436
|
+
|
|
1437
|
+
mallProductName: {
|
|
1438
|
+
component: BsHeaderChild,
|
|
1439
|
+
name: "平台商品名称",
|
|
1440
|
+
key: "mallProductName",
|
|
1441
|
+
width: 250
|
|
1442
|
+
},
|
|
1443
|
+
mallProductOutCode: {
|
|
1444
|
+
component: BsHeaderChild,
|
|
1445
|
+
name: "平台商品编码",
|
|
1446
|
+
key: "mallProductOutCode",
|
|
1447
|
+
width: 150
|
|
1448
|
+
},
|
|
1449
|
+
mallProductId: {
|
|
1450
|
+
component: BsHeaderChild,
|
|
1451
|
+
name: "平台商品ID",
|
|
1452
|
+
key: "mallProductId",
|
|
1453
|
+
width: 250
|
|
1454
|
+
},
|
|
1455
|
+
mallSkuName: {
|
|
1456
|
+
component: BsHeaderChild,
|
|
1457
|
+
name: "平台规格名称",
|
|
1458
|
+
key: "mallSkuName",
|
|
1459
|
+
width: 250
|
|
1460
|
+
},
|
|
1461
|
+
mallSkuId: {
|
|
1462
|
+
component: BsHeaderChild,
|
|
1463
|
+
name: "平台规格ID",
|
|
1464
|
+
key: "mallSkuId",
|
|
1465
|
+
width: 250
|
|
1466
|
+
},
|
|
1467
|
+
sellCount: {
|
|
1468
|
+
component: BsHeaderChild,
|
|
1469
|
+
name: "数量",
|
|
1470
|
+
key: "sellCount",
|
|
1471
|
+
width: 100
|
|
1472
|
+
},
|
|
1473
|
+
sellPrice: {
|
|
1474
|
+
component: BsHeaderChild,
|
|
1475
|
+
name: "单价",
|
|
1476
|
+
key: "sellPrice",
|
|
1477
|
+
width: 150
|
|
1478
|
+
},
|
|
1479
|
+
mallSellingPrice: {
|
|
1480
|
+
component: BsHeaderChild,
|
|
1481
|
+
name: "平台商品价格",
|
|
1482
|
+
key: "mallSellingPrice",
|
|
1483
|
+
width: 150
|
|
1484
|
+
},
|
|
1485
|
+
sellTotal: {
|
|
1486
|
+
component: BsHeaderChild,
|
|
1487
|
+
name: "金额",
|
|
1488
|
+
key: "sellTotal",
|
|
1489
|
+
width: 150
|
|
1490
|
+
},
|
|
1491
|
+
settlementPrice: {
|
|
1492
|
+
component: BsHeaderChild,
|
|
1493
|
+
name: "结算价",
|
|
1494
|
+
key: "settlementPrice",
|
|
1495
|
+
width: 150
|
|
1496
|
+
},
|
|
1497
|
+
divideOrderFee: {
|
|
1498
|
+
component: BsHeaderChild,
|
|
1499
|
+
name: "分摊实付金额",
|
|
1500
|
+
key: "divideOrderFee",
|
|
1501
|
+
width: 150
|
|
1502
|
+
},
|
|
1503
|
+
bfit: {
|
|
1504
|
+
component: BsHeaderChild,
|
|
1505
|
+
name: "是否组合装",
|
|
1506
|
+
key: "bfit",
|
|
1507
|
+
width: 150,
|
|
1508
|
+
transformValue: function transformValue(val) {
|
|
1509
|
+
if (isNull(val)) return "--";
|
|
1510
|
+
return val === "True" ? "是" : "否";
|
|
1511
|
+
},
|
|
1512
|
+
renderExport: function renderExport(val) {
|
|
1513
|
+
if (isNull(val)) return "--";
|
|
1514
|
+
return val === "True" ? "是" : "否";
|
|
1515
|
+
}
|
|
1516
|
+
},
|
|
1517
|
+
combinationName: {
|
|
1518
|
+
component: BsHeaderChild,
|
|
1519
|
+
name: "组合商品名称",
|
|
1520
|
+
key: "combinationName",
|
|
1521
|
+
width: 150
|
|
1522
|
+
},
|
|
1523
|
+
combinationCode: {
|
|
1524
|
+
component: BsHeaderChild,
|
|
1525
|
+
name: "组合商品编码",
|
|
1526
|
+
key: "combinationCode",
|
|
1527
|
+
width: 150
|
|
1528
|
+
},
|
|
1529
|
+
gift: {
|
|
1530
|
+
component: BsHeaderChild,
|
|
1531
|
+
name: "是否赠品",
|
|
1532
|
+
key: "gift",
|
|
1533
|
+
width: 150,
|
|
1534
|
+
transformValue: function transformValue(val) {
|
|
1535
|
+
if (isNull(val)) return "--";
|
|
1536
|
+
return val === "1" ? "是" : "否";
|
|
1537
|
+
},
|
|
1538
|
+
renderExport: function renderExport(val) {
|
|
1539
|
+
if (isNull(val)) return "--";
|
|
1540
|
+
return val === "1" ? "是" : "否";
|
|
1541
|
+
}
|
|
1542
|
+
},
|
|
1543
|
+
skuNote: {
|
|
1544
|
+
component: BsHeaderChild,
|
|
1545
|
+
name: "商品备注",
|
|
1546
|
+
key: "skuNote",
|
|
1547
|
+
width: 150
|
|
1548
|
+
}
|
|
1549
|
+
},
|
|
1550
|
+
itemKey: {
|
|
1551
|
+
// goodsName: "货品名称",
|
|
1552
|
+
// goodsCode: "货品编号",
|
|
1553
|
+
// goodsId: "货品ID",
|
|
1554
|
+
goodsClass: "货品类别",
|
|
1555
|
+
code: "条码",
|
|
1556
|
+
// specName: "规格名称",
|
|
1557
|
+
// specCode: "规格编号",
|
|
1558
|
+
specId: "规格ID",
|
|
1559
|
+
productName: "系统商品名称",
|
|
1560
|
+
productCode: "系统商品编码",
|
|
1561
|
+
productId: "系统商品ID",
|
|
1562
|
+
skuName: "系统规格名称",
|
|
1563
|
+
skuCode: "系统规格编码",
|
|
1564
|
+
mallProductName: "平台商品名称",
|
|
1565
|
+
mallProductOutCode: "平台商品编码",
|
|
1566
|
+
mallProductId: "平台商品ID",
|
|
1567
|
+
mallSkuName: "平台规格名称",
|
|
1568
|
+
mallSkuId: "平台规格ID",
|
|
1569
|
+
sellCount: "数量",
|
|
1570
|
+
sellPrice: "单价",
|
|
1571
|
+
mallSellingPrice: "平台商品价格",
|
|
1572
|
+
sellTotal: "金额",
|
|
1573
|
+
settlementPrice: "结算价",
|
|
1574
|
+
divideOrderFee: "分摊实付金额",
|
|
1575
|
+
bfit: "是否组合装",
|
|
1576
|
+
combinationName: "组合商品名称",
|
|
1577
|
+
combinationCode: "组合商品编码",
|
|
1578
|
+
gift: "是否赠品",
|
|
1579
|
+
skuNote: "商品备注"
|
|
1580
|
+
},
|
|
1581
|
+
moneyKey: "sellTotal"
|
|
1582
|
+
},
|
|
1583
|
+
JY_REISSUE_GOODS: {
|
|
1584
|
+
headerMap: {
|
|
1585
|
+
productName: {
|
|
1586
|
+
component: BsHeaderChild,
|
|
1587
|
+
name: "系统商品名称",
|
|
1588
|
+
key: "productName",
|
|
1589
|
+
width: 150
|
|
1590
|
+
},
|
|
1591
|
+
productCode: {
|
|
1592
|
+
component: BsHeaderChild,
|
|
1593
|
+
name: "系统商品编码",
|
|
1594
|
+
key: "productCode",
|
|
1595
|
+
width: 150
|
|
1596
|
+
},
|
|
1597
|
+
productId: {
|
|
1598
|
+
component: BsHeaderChild,
|
|
1599
|
+
name: "系统商品ID",
|
|
1600
|
+
key: "productId",
|
|
1601
|
+
width: 150
|
|
1602
|
+
},
|
|
1603
|
+
skuName: {
|
|
1604
|
+
component: BsHeaderChild,
|
|
1605
|
+
name: "系统规格名称",
|
|
1606
|
+
key: "skuName",
|
|
1607
|
+
width: 150
|
|
1608
|
+
},
|
|
1609
|
+
skuCode: {
|
|
1610
|
+
component: BsHeaderChild,
|
|
1611
|
+
name: "系统规格编码",
|
|
1612
|
+
key: "skuCode",
|
|
1613
|
+
width: 150
|
|
1614
|
+
},
|
|
1615
|
+
specId: {
|
|
1616
|
+
component: BsHeaderChild,
|
|
1617
|
+
name: "规格ID",
|
|
1618
|
+
key: "specId",
|
|
1619
|
+
width: 150
|
|
1620
|
+
},
|
|
1621
|
+
// goodsName: {
|
|
1622
|
+
// component: BsHeaderChild,
|
|
1623
|
+
// name: "货品名称",
|
|
1624
|
+
// key: "goodsName",
|
|
1625
|
+
// width: 250,
|
|
1626
|
+
// },
|
|
1627
|
+
// goodsCode: {
|
|
1628
|
+
// component: BsHeaderChild,
|
|
1629
|
+
// name: "货品编号",
|
|
1630
|
+
// key: "goodsCode",
|
|
1631
|
+
// width: 200,
|
|
1632
|
+
// },
|
|
1633
|
+
// goodsId: {
|
|
1634
|
+
// component: BsHeaderChild,
|
|
1635
|
+
// name: "货品ID",
|
|
1636
|
+
// key: "goodsId",
|
|
1637
|
+
// width: 150,
|
|
1638
|
+
// },
|
|
1639
|
+
goodsClass: {
|
|
1640
|
+
component: BsHeaderChild,
|
|
1641
|
+
name: "货品类别",
|
|
1642
|
+
key: "goodsClass",
|
|
1643
|
+
width: 150
|
|
1644
|
+
},
|
|
1645
|
+
code: {
|
|
1646
|
+
component: BsHeaderChild,
|
|
1647
|
+
name: "条码",
|
|
1648
|
+
key: "code",
|
|
1649
|
+
width: 150
|
|
1650
|
+
},
|
|
1651
|
+
// specName: {
|
|
1652
|
+
// component: BsHeaderChild,
|
|
1653
|
+
// name: "规格名称",
|
|
1654
|
+
// key: "specName",
|
|
1655
|
+
// width: 200,
|
|
1656
|
+
// },
|
|
1657
|
+
// specCode: {
|
|
1658
|
+
// component: BsHeaderChild,
|
|
1659
|
+
// name: "规格编号",
|
|
1660
|
+
// key: "specCode",
|
|
1661
|
+
// width: 150,
|
|
1662
|
+
// },
|
|
1663
|
+
|
|
1664
|
+
mallProductName: {
|
|
1665
|
+
component: BsHeaderChild,
|
|
1666
|
+
name: "平台商品名称",
|
|
1667
|
+
key: "mallProductName",
|
|
1668
|
+
width: 250
|
|
1669
|
+
},
|
|
1670
|
+
mallProductOutCode: {
|
|
1671
|
+
component: BsHeaderChild,
|
|
1672
|
+
name: "平台商品编码",
|
|
1673
|
+
key: "mallProductOutCode",
|
|
1674
|
+
width: 150
|
|
1675
|
+
},
|
|
1676
|
+
mallProductId: {
|
|
1677
|
+
component: BsHeaderChild,
|
|
1678
|
+
name: "平台商品ID",
|
|
1679
|
+
key: "mallProductId",
|
|
1680
|
+
width: 250
|
|
1681
|
+
},
|
|
1682
|
+
mallSkuName: {
|
|
1683
|
+
component: BsHeaderChild,
|
|
1684
|
+
name: "平台规格名称",
|
|
1685
|
+
key: "mallSkuName",
|
|
1686
|
+
width: 250
|
|
1687
|
+
},
|
|
1688
|
+
mallSkuId: {
|
|
1689
|
+
component: BsHeaderChild,
|
|
1690
|
+
name: "平台规格ID",
|
|
1691
|
+
key: "mallSkuId",
|
|
1692
|
+
width: 250
|
|
1693
|
+
},
|
|
1694
|
+
sellCount: {
|
|
1695
|
+
component: BsHeaderChild,
|
|
1696
|
+
name: "数量",
|
|
1697
|
+
key: "sellCount",
|
|
1698
|
+
width: 100
|
|
1699
|
+
},
|
|
1700
|
+
sellPrice: {
|
|
1701
|
+
component: BsHeaderChild,
|
|
1702
|
+
name: "单价",
|
|
1703
|
+
key: "sellPrice",
|
|
1704
|
+
width: 150
|
|
1705
|
+
},
|
|
1706
|
+
mallSellingPrice: {
|
|
1707
|
+
component: BsHeaderChild,
|
|
1708
|
+
name: "平台商品价格",
|
|
1709
|
+
key: "mallSellingPrice",
|
|
1710
|
+
width: 150
|
|
1711
|
+
},
|
|
1712
|
+
sellTotal: {
|
|
1713
|
+
component: BsHeaderChild,
|
|
1714
|
+
name: "金额",
|
|
1715
|
+
key: "sellTotal",
|
|
1716
|
+
width: 150
|
|
1717
|
+
},
|
|
1718
|
+
bfit: {
|
|
1719
|
+
component: BsHeaderChild,
|
|
1720
|
+
name: "是否组合装",
|
|
1721
|
+
key: "bfit",
|
|
1722
|
+
width: 150,
|
|
1723
|
+
transformValue: function transformValue(val) {
|
|
1724
|
+
if (isNull(val)) return "--";
|
|
1725
|
+
return val === "True" ? "是" : "否";
|
|
1726
|
+
},
|
|
1727
|
+
renderExport: function renderExport(val) {
|
|
1728
|
+
if (isNull(val)) return "--";
|
|
1729
|
+
return val === "True" ? "是" : "否";
|
|
1730
|
+
}
|
|
1731
|
+
},
|
|
1732
|
+
combinationName: {
|
|
1733
|
+
component: BsHeaderChild,
|
|
1734
|
+
name: "组合商品名称",
|
|
1735
|
+
key: "combinationName",
|
|
1736
|
+
width: 150
|
|
1737
|
+
},
|
|
1738
|
+
combinationCode: {
|
|
1739
|
+
component: BsHeaderChild,
|
|
1740
|
+
name: "组合商品编码",
|
|
1741
|
+
key: "combinationCode",
|
|
1742
|
+
width: 150
|
|
1743
|
+
},
|
|
1744
|
+
gift: {
|
|
1745
|
+
component: BsHeaderChild,
|
|
1746
|
+
name: "是否赠品",
|
|
1747
|
+
key: "gift",
|
|
1748
|
+
width: 150,
|
|
1749
|
+
transformValue: function transformValue(val) {
|
|
1750
|
+
if (isNull(val)) return "--";
|
|
1751
|
+
return val === "1" ? "是" : "否";
|
|
1752
|
+
},
|
|
1753
|
+
renderExport: function renderExport(val) {
|
|
1754
|
+
if (isNull(val)) return "--";
|
|
1755
|
+
return val === "1" ? "是" : "否";
|
|
1756
|
+
}
|
|
1757
|
+
}
|
|
1758
|
+
},
|
|
1759
|
+
itemKey: {
|
|
1760
|
+
// goodsName: "货品名称",
|
|
1761
|
+
// goodsCode: "货品编号",
|
|
1762
|
+
// goodsId: "货品ID",
|
|
1763
|
+
goodsClass: "货品类别",
|
|
1764
|
+
code: "条码",
|
|
1765
|
+
// specName: "规格名称",
|
|
1766
|
+
// specCode: "规格编号",
|
|
1767
|
+
specId: "规格ID",
|
|
1768
|
+
productName: "系统商品名称",
|
|
1769
|
+
productCode: "系统商品编码",
|
|
1770
|
+
productId: "系统商品ID",
|
|
1771
|
+
skuName: "系统规格名称",
|
|
1772
|
+
skuCode: "系统规格编码",
|
|
1773
|
+
mallProductName: "平台商品名称",
|
|
1774
|
+
mallProductOutCode: "平台商品编码",
|
|
1775
|
+
mallProductId: "平台商品ID",
|
|
1776
|
+
mallSkuName: "平台规格名称",
|
|
1777
|
+
mallSkuId: "平台规格ID",
|
|
1778
|
+
sellCount: "数量",
|
|
1779
|
+
sellPrice: "单价",
|
|
1780
|
+
mallSellingPrice: "平台商品价格",
|
|
1781
|
+
sellTotal: "金额",
|
|
1782
|
+
divideOrderFee: "分摊实付金额",
|
|
1783
|
+
bfit: "是否组合装",
|
|
1784
|
+
combinationName: "组合商品名称",
|
|
1785
|
+
combinationCode: "组合商品编码",
|
|
1786
|
+
gift: "是否赠品"
|
|
1787
|
+
},
|
|
1788
|
+
moneyKey: "sellTotal"
|
|
1789
|
+
},
|
|
1356
1790
|
SKX_GOODS: {
|
|
1357
1791
|
headerMap: {
|
|
1358
1792
|
skuEcode: {
|
|
@@ -65,7 +65,7 @@ var GyGoods = /*#__PURE__*/_createClass(function GyGoods(options) {
|
|
|
65
65
|
return null;
|
|
66
66
|
});
|
|
67
67
|
_defineProperty(this, "editRender", function (p) {
|
|
68
|
-
var _this$componentConfig3, _this$componentConfig4, _this$componentConfig5, _this$effects, _this$effects2, _this$effects3;
|
|
68
|
+
var _this$componentConfig3, _this$componentConfig4, _this$componentConfig5, _this$effects, _this$effects2, _this$effects3, _this$effects4, _this$effects5;
|
|
69
69
|
return /*#__PURE__*/React.createElement(GetFormItem, {
|
|
70
70
|
title: _this.name,
|
|
71
71
|
name: _this.id,
|
|
@@ -80,6 +80,8 @@ var GyGoods = /*#__PURE__*/_createClass(function GyGoods(options) {
|
|
|
80
80
|
shopId: (_this$effects = _this.effects) === null || _this$effects === void 0 ? void 0 : _this$effects.shopId,
|
|
81
81
|
shopList: ((_this$effects2 = _this.effects) === null || _this$effects2 === void 0 ? void 0 : _this$effects2.shopList) || [],
|
|
82
82
|
companyKey: (_this$effects3 = _this.effects) === null || _this$effects3 === void 0 ? void 0 : _this$effects3.companyKey,
|
|
83
|
+
form: (_this$effects4 = _this.effects) === null || _this$effects4 === void 0 ? void 0 : _this$effects4.form,
|
|
84
|
+
templateDetail: (_this$effects5 = _this.effects) === null || _this$effects5 === void 0 ? void 0 : _this$effects5.templateDetail,
|
|
83
85
|
type: _this.type,
|
|
84
86
|
width: "90%"
|
|
85
87
|
}))
|
|
@@ -95,7 +95,7 @@ var GyReissue = /*#__PURE__*/_createClass(function GyReissue(options) {
|
|
|
95
95
|
return null;
|
|
96
96
|
});
|
|
97
97
|
_defineProperty(this, "editRender", function (p) {
|
|
98
|
-
var _this$componentConfig3, _this$componentConfig4, _this$componentConfig5, _this$effects, _this$effects2, _this$effects3;
|
|
98
|
+
var _this$componentConfig3, _this$componentConfig4, _this$componentConfig5, _this$effects, _this$effects2, _this$effects3, _this$effects4, _this$effects5;
|
|
99
99
|
return /*#__PURE__*/React.createElement(GetFormItem, {
|
|
100
100
|
title: _this.name,
|
|
101
101
|
name: _this.id,
|
|
@@ -111,6 +111,8 @@ var GyReissue = /*#__PURE__*/_createClass(function GyReissue(options) {
|
|
|
111
111
|
shopId: (_this$effects = _this.effects) === null || _this$effects === void 0 ? void 0 : _this$effects.shopId,
|
|
112
112
|
shopList: ((_this$effects2 = _this.effects) === null || _this$effects2 === void 0 ? void 0 : _this$effects2.shopList) || [],
|
|
113
113
|
companyKey: (_this$effects3 = _this.effects) === null || _this$effects3 === void 0 ? void 0 : _this$effects3.companyKey,
|
|
114
|
+
form: (_this$effects4 = _this.effects) === null || _this$effects4 === void 0 ? void 0 : _this$effects4.form,
|
|
115
|
+
templateDetail: (_this$effects5 = _this.effects) === null || _this$effects5 === void 0 ? void 0 : _this$effects5.templateDetail,
|
|
114
116
|
width: "90%",
|
|
115
117
|
type: _this.type
|
|
116
118
|
}))
|
|
@@ -92,7 +92,7 @@ var GyReturn = /*#__PURE__*/_createClass(function GyReturn(options) {
|
|
|
92
92
|
return null;
|
|
93
93
|
});
|
|
94
94
|
_defineProperty(this, "editRender", function (p) {
|
|
95
|
-
var _this$componentConfig3, _this$componentConfig4, _this$componentConfig5, _this$effects, _this$effects2, _this$effects3;
|
|
95
|
+
var _this$componentConfig3, _this$componentConfig4, _this$componentConfig5, _this$effects, _this$effects2, _this$effects3, _this$effects4, _this$effects5;
|
|
96
96
|
return /*#__PURE__*/React.createElement(GetFormItem, {
|
|
97
97
|
title: _this.name,
|
|
98
98
|
name: _this.id,
|
|
@@ -107,6 +107,8 @@ var GyReturn = /*#__PURE__*/_createClass(function GyReturn(options) {
|
|
|
107
107
|
shopId: (_this$effects = _this.effects) === null || _this$effects === void 0 ? void 0 : _this$effects.shopId,
|
|
108
108
|
shopList: ((_this$effects2 = _this.effects) === null || _this$effects2 === void 0 ? void 0 : _this$effects2.shopList) || [],
|
|
109
109
|
companyKey: (_this$effects3 = _this.effects) === null || _this$effects3 === void 0 ? void 0 : _this$effects3.companyKey,
|
|
110
|
+
form: (_this$effects4 = _this.effects) === null || _this$effects4 === void 0 ? void 0 : _this$effects4.form,
|
|
111
|
+
templateDetail: (_this$effects5 = _this.effects) === null || _this$effects5 === void 0 ? void 0 : _this$effects5.templateDetail,
|
|
110
112
|
width: "90%",
|
|
111
113
|
type: _this.type
|
|
112
114
|
}))
|
|
@@ -70,6 +70,14 @@ var typeMap = {
|
|
|
70
70
|
sendName: "gySendName",
|
|
71
71
|
platformType: "gy",
|
|
72
72
|
dataType: "weakenArray"
|
|
73
|
+
},
|
|
74
|
+
JY_SEND_GOOD: {
|
|
75
|
+
key: "jySendGood",
|
|
76
|
+
name: "jy",
|
|
77
|
+
sendId: "jySendId",
|
|
78
|
+
sendName: "jySendName",
|
|
79
|
+
platformType: "jy",
|
|
80
|
+
dataType: "weakenArray"
|
|
73
81
|
}
|
|
74
82
|
};
|
|
75
83
|
var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(_options) {
|
|
@@ -176,7 +184,7 @@ var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(_options) {
|
|
|
176
184
|
});
|
|
177
185
|
_defineProperty(this, "filterConfig", function (item) {
|
|
178
186
|
var _typeMap$_this$type8, _typeMap$_this$type9, _typeMap$_this$type11;
|
|
179
|
-
return [["WDT_SEND_GOOD", "BS_E3_SEND_GOOD", "GY_SEND_GOOD"].includes(_this.type) ? {
|
|
187
|
+
return [["WDT_SEND_GOOD", "BS_E3_SEND_GOOD", "GY_SEND_GOOD", "JY_SEND_GOOD"].includes(_this.type) ? {
|
|
180
188
|
searchDefaultConditions: SYMBOL.in,
|
|
181
189
|
type: item.type,
|
|
182
190
|
id: "".concat(item.id, "_").concat((_typeMap$_this$type8 = typeMap[_this.type]) === null || _typeMap$_this$type8 === void 0 ? void 0 : _typeMap$_this$type8.sendName),
|
|
@@ -106,7 +106,7 @@ var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(_options) {
|
|
|
106
106
|
});
|
|
107
107
|
});
|
|
108
108
|
_defineProperty(this, "filterConfig", function (item) {
|
|
109
|
-
return [["WDT_SEND_GOOD", "BS_E3_SEND_GOOD", "GY_SEND_GOOD"].includes(_this.type) ? {
|
|
109
|
+
return [["WDT_SEND_GOOD", "BS_E3_SEND_GOOD", "GY_SEND_GOOD", "JY_SEND_GOOD"].includes(_this.type) ? {
|
|
110
110
|
searchDefaultConditions: SYMBOL.in,
|
|
111
111
|
type: item.type,
|
|
112
112
|
id: "".concat(item.id, "_").concat(_this.suffixSendName),
|
|
@@ -1,14 +1,7 @@
|
|
|
1
1
|
import { ComponentInterface, PickOption, ColumnConfig, Record } from "../../../type";
|
|
2
2
|
import React from "react";
|
|
3
3
|
import CommonHeaderGoods from "../../CommonHeaderGood";
|
|
4
|
-
declare const CONFIG_MAP:
|
|
5
|
-
JST_GOODS: {
|
|
6
|
-
key: string;
|
|
7
|
-
};
|
|
8
|
-
KM_GOODS: {
|
|
9
|
-
key: string;
|
|
10
|
-
};
|
|
11
|
-
};
|
|
4
|
+
declare const CONFIG_MAP: Record;
|
|
12
5
|
declare class PublicGoods implements ComponentInterface {
|
|
13
6
|
name: string;
|
|
14
7
|
id: string;
|
|
@@ -14,14 +14,28 @@ import { BsGoodsTable } from "../../Common";
|
|
|
14
14
|
import CommonHeaderGoods from "../../CommonHeaderGood";
|
|
15
15
|
import ItemView from "../../../commonComponents/ItemView";
|
|
16
16
|
import { isNull } from "@kmkf-fe-packages/kmkf-utils";
|
|
17
|
-
import { CommonGoods as Goods } from "@kmkf-fe-packages/basic-components";
|
|
17
|
+
import { CommonGoods as Goods, erpFormValidator } from "@kmkf-fe-packages/basic-components";
|
|
18
18
|
import { SYMBOL } from "../../../constant";
|
|
19
19
|
var CONFIG_MAP = {
|
|
20
20
|
JST_GOODS: {
|
|
21
|
+
name: "聚水潭",
|
|
21
22
|
key: "jstGoods"
|
|
22
23
|
},
|
|
23
24
|
KM_GOODS: {
|
|
25
|
+
name: "快麦ERP",
|
|
24
26
|
key: "kmGoods"
|
|
27
|
+
},
|
|
28
|
+
JY_GOODS: {
|
|
29
|
+
name: "巨益",
|
|
30
|
+
key: "jyGoods",
|
|
31
|
+
validator: function validator(_rule, value, type) {
|
|
32
|
+
if (!_rule.required) return Promise.resolve();
|
|
33
|
+
var validatorFlag = erpFormValidator(_rule, value, type);
|
|
34
|
+
if (validatorFlag) {
|
|
35
|
+
return validatorFlag;
|
|
36
|
+
}
|
|
37
|
+
return Promise.resolve();
|
|
38
|
+
}
|
|
25
39
|
}
|
|
26
40
|
};
|
|
27
41
|
var PublicGoods = /*#__PURE__*/_createClass(function PublicGoods(options) {
|
|
@@ -120,16 +134,26 @@ var PublicGoods = /*#__PURE__*/_createClass(function PublicGoods(options) {
|
|
|
120
134
|
}));
|
|
121
135
|
this.children = [this.headers];
|
|
122
136
|
this.componentConfig = options === null || options === void 0 ? void 0 : options.componentConfig;
|
|
123
|
-
|
|
124
|
-
|
|
137
|
+
var isRequired = this === null || this === void 0 ? void 0 : (_this$componentConfig6 = this.componentConfig) === null || _this$componentConfig6 === void 0 ? void 0 : _this$componentConfig6.required;
|
|
138
|
+
this.rules = [{
|
|
139
|
+
required: isRequired,
|
|
125
140
|
validator: function validator(_, value) {
|
|
126
141
|
var _value$key;
|
|
127
|
-
if (!value || !(value !== null && value !== void 0 && (_value$key = value[key]) !== null && _value$key !== void 0 && _value$key.length)) {
|
|
128
|
-
|
|
142
|
+
if (isRequired && (!value || !(value !== null && value !== void 0 && (_value$key = value[key]) !== null && _value$key !== void 0 && _value$key.length))) {
|
|
143
|
+
var _CONFIG_MAP$_this$typ6;
|
|
144
|
+
return Promise.reject(new Error("\u8BF7\u9009\u62E9".concat((_CONFIG_MAP$_this$typ6 = CONFIG_MAP[_this.type]) === null || _CONFIG_MAP$_this$typ6 === void 0 ? void 0 : _CONFIG_MAP$_this$typ6.name, "\u5546\u54C1")));
|
|
129
145
|
}
|
|
130
146
|
return Promise.resolve();
|
|
131
147
|
}
|
|
132
|
-
}
|
|
148
|
+
}, {
|
|
149
|
+
required: isRequired,
|
|
150
|
+
validator: function validator(_rule, value) {
|
|
151
|
+
var _CONFIG_MAP$_this$typ7, _CONFIG_MAP$_this$typ8;
|
|
152
|
+
return ((_CONFIG_MAP$_this$typ7 = CONFIG_MAP[_this.type]) === null || _CONFIG_MAP$_this$typ7 === void 0 ? void 0 : (_CONFIG_MAP$_this$typ8 = _CONFIG_MAP$_this$typ7.validator) === null || _CONFIG_MAP$_this$typ8 === void 0 ? void 0 : _CONFIG_MAP$_this$typ8.call(_CONFIG_MAP$_this$typ7, _rule, value, _this.type)) || function () {
|
|
153
|
+
return Promise.resolve();
|
|
154
|
+
};
|
|
155
|
+
}
|
|
156
|
+
}];
|
|
133
157
|
this.dataType = "object";
|
|
134
158
|
});
|
|
135
159
|
export default PublicGoods;
|
|
@@ -74,6 +74,24 @@ var typeMap = {
|
|
|
74
74
|
}
|
|
75
75
|
return Promise.resolve();
|
|
76
76
|
}
|
|
77
|
+
},
|
|
78
|
+
JY_REISSUE_GOODS: {
|
|
79
|
+
key: "jyReissueGoods",
|
|
80
|
+
typeName: "jyReissueType",
|
|
81
|
+
remark: "jyReissueType_memo",
|
|
82
|
+
systemOrderNo: "jySystemOrderNo",
|
|
83
|
+
systemOrderBillType: "jySystemOrderBillType",
|
|
84
|
+
errMsg: "请选择巨益补发商品",
|
|
85
|
+
name: "巨益",
|
|
86
|
+
compType: "补发",
|
|
87
|
+
validator: function validator(_rule, value, type) {
|
|
88
|
+
if (!_rule.required) return Promise.resolve();
|
|
89
|
+
var validatorFlag = erpFormValidator(_rule, value, type);
|
|
90
|
+
if (validatorFlag) {
|
|
91
|
+
return validatorFlag;
|
|
92
|
+
}
|
|
93
|
+
return Promise.resolve();
|
|
94
|
+
}
|
|
77
95
|
}
|
|
78
96
|
};
|
|
79
97
|
var PublicReissue = /*#__PURE__*/_createClass(function PublicReissue(options) {
|
|
@@ -112,7 +112,7 @@ var Logistics = /*#__PURE__*/_createClass(function Logistics(_options) {
|
|
|
112
112
|
var list = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_").concat((_typeMap$_this$type4 = typeMap[_this.type]) === null || _typeMap$_this$type4 === void 0 ? void 0 : _typeMap$_this$type4.key)];
|
|
113
113
|
return (list || []).map(function (item) {
|
|
114
114
|
var _this$componentConfig3, _ref;
|
|
115
|
-
return [((_this$componentConfig3 = _this.componentConfig) === null || _this$componentConfig3 === void 0 ? void 0 : _this$componentConfig3.logistics)
|
|
115
|
+
return [["gy", "jy"].includes(((_this$componentConfig3 = _this.componentConfig) === null || _this$componentConfig3 === void 0 ? void 0 : _this$componentConfig3.logistics) || "") ? (_ref = _this.expressDateInstance.getExpressNameByCode(item === null || item === void 0 ? void 0 : item.logisticsCompany, false) || (item === null || item === void 0 ? void 0 : item.logisticsCompanyName)) !== null && _ref !== void 0 ? _ref : "" : _this.expressDateInstance.getExpressNameByCode(item === null || item === void 0 ? void 0 : item.logisticsCompany), item === null || item === void 0 ? void 0 : item.logisticsCode].join("/");
|
|
116
116
|
}).join(",");
|
|
117
117
|
});
|
|
118
118
|
_defineProperty(this, "editRender", function (p) {
|
|
@@ -195,7 +195,7 @@ var Logistics = /*#__PURE__*/_createClass(function Logistics(_options) {
|
|
|
195
195
|
validator: function validator(_, value) {
|
|
196
196
|
var hasNo = (value || []).some(function (item) {
|
|
197
197
|
var _this$componentConfig10;
|
|
198
|
-
if (((_this$componentConfig10 = _this.componentConfig) === null || _this$componentConfig10 === void 0 ? void 0 : _this$componentConfig10.logistics)
|
|
198
|
+
if (["gy", "jy"].includes(((_this$componentConfig10 = _this.componentConfig) === null || _this$componentConfig10 === void 0 ? void 0 : _this$componentConfig10.logistics) || "")) {
|
|
199
199
|
return (item.logisticsCompany || item.logisticsCompanyName) && item.logisticsCode;
|
|
200
200
|
}
|
|
201
201
|
return item.logisticsCompany && item.logisticsCode;
|
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 } from "./index";
|
|
2
2
|
import { PickOption } from "./type";
|
|
3
|
-
export declare const factory: (type: string, options: PickOption) => BsLogistics | BsSystemOrder |
|
|
3
|
+
export declare const factory: (type: string, options: PickOption) => BsLogistics | BsSystemOrder | 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 | JstSendGood | JstSupply | BsGoods | BsE3Goods | PublicGoods | PublicReissueGoods | PublicExchange | BsE3Reissue | BsExchange | BsReissue | BsReturn | FlowStatusSelect | FlowMarkSelect | FlowTag | TemplateSelect | WorkOrderId | LogisticsInterception | LogisticsMoreInterception | LogisticsTrajectory | LogisticsMoreTrajectory | PlatForm | ShopInput | Submitter | PrevSubmitter | FlowCreator | Handler | CompletedUser | FlowWorkOrderId | StatusSelect | Calculation | CommonSystemOrder | CommonMultiStatus | NodeDeadLine | HandlerDeadLine | NodeStayDuration | WlnGoods | BsPosting | NodeInput | FlowWorkOrderStatus | MsgStatus | WdtGoods | WdtReissue | WdtReturn | WdtExchange | WdtShopSelect | KmVideo | CommonInput | PaymentVoucherCode | Label | MemberLevel | AfterSalesOrderId | GyReissue | GyReturn | AsyncSelect | SkxIdInputSelect | SkxGoods | OrderSubForm | GyGoods;
|
package/dist/esm/factory.js
CHANGED
|
@@ -142,6 +142,7 @@ export var factory = function factory(type, options) {
|
|
|
142
142
|
case "BS_E3_SYSTEM_ORDER":
|
|
143
143
|
case "GY_SYSTEM_ORDER":
|
|
144
144
|
case "JST_SYSTEM_ORDER":
|
|
145
|
+
case "JY_SYSTEM_ORDER":
|
|
145
146
|
return new BsSystemOrder(options);
|
|
146
147
|
case "JST_SEND_GOOD":
|
|
147
148
|
case "BS_SEND_GOOD":
|
|
@@ -150,6 +151,7 @@ export var factory = function factory(type, options) {
|
|
|
150
151
|
case "WDT_SEND_GOOD":
|
|
151
152
|
case "KM_SEND_GOOD":
|
|
152
153
|
case "GY_SEND_GOOD":
|
|
154
|
+
case "JY_SEND_GOOD":
|
|
153
155
|
return new JstSendGood(options);
|
|
154
156
|
case "BS_POSTING":
|
|
155
157
|
return new BsPosting(options);
|
|
@@ -159,11 +161,13 @@ export var factory = function factory(type, options) {
|
|
|
159
161
|
return new BsE3Goods(options);
|
|
160
162
|
case "GY_GOODS":
|
|
161
163
|
return new GyGoods(options);
|
|
164
|
+
case "JY_GOODS":
|
|
162
165
|
case "KM_GOODS":
|
|
163
166
|
case "JST_GOODS":
|
|
164
167
|
return new PublicGoods(options);
|
|
165
168
|
case "JST_REISSUE_GOODS":
|
|
166
169
|
case "KM_REISSUE_GOODS":
|
|
170
|
+
case "JY_REISSUE_GOODS":
|
|
167
171
|
return new PublicReissueGoods(options);
|
|
168
172
|
case "BS_E3_REISSUE_GOODS":
|
|
169
173
|
return new BsE3Reissue(options);
|
|
@@ -200,6 +204,7 @@ export var factory = function factory(type, options) {
|
|
|
200
204
|
case "JST_LOGISTICS":
|
|
201
205
|
case "KM_LOGISTICS":
|
|
202
206
|
case "GY_LOGISTICS":
|
|
207
|
+
case "JY_LOGISTICS":
|
|
203
208
|
case "SKX_LOGISTICS":
|
|
204
209
|
case "SKX_RETURN_LOGISTICS":
|
|
205
210
|
return new BsLogistics(options);
|
|
@@ -10,6 +10,7 @@ export declare const queryWdtLogisticsCompany: () => Promise<void>;
|
|
|
10
10
|
export declare const queryBsE3LogisticsCompany: () => Promise<void>;
|
|
11
11
|
export declare const queryJSTLogisticsCompany: () => Promise<void>;
|
|
12
12
|
export declare const queryGYLogisticsCompany: () => Promise<void>;
|
|
13
|
+
export declare const queryJYLogisticsCompany: () => Promise<void>;
|
|
13
14
|
export declare const queryWLNLogisticsCompany: () => Promise<void>;
|
|
14
15
|
export declare const queryKMLogisticsCompany: () => Promise<void>;
|
|
15
16
|
export declare const getAlipayBillReceipt: (data: any) => Promise<any>;
|
package/dist/esm/service/api.js
CHANGED
|
@@ -275,6 +275,12 @@ export var queryGYLogisticsCompany = function queryGYLogisticsCompany() {
|
|
|
275
275
|
instance.expressData = data;
|
|
276
276
|
}).catch(console.log);
|
|
277
277
|
};
|
|
278
|
+
export var queryJYLogisticsCompany = function queryJYLogisticsCompany() {
|
|
279
|
+
var instance = ExpressData.getInstance("jy");
|
|
280
|
+
return servers.JY.getLogisticsDataAsync().then(function (data) {
|
|
281
|
+
instance.expressData = data;
|
|
282
|
+
}).catch(console.log);
|
|
283
|
+
};
|
|
278
284
|
export var queryWLNLogisticsCompany = function queryWLNLogisticsCompany() {
|
|
279
285
|
var instance = ExpressData.getInstance("wln");
|
|
280
286
|
return servers.WLN.getLogisticsDataAsync().then(function (data) {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kmkf-fe-packages/services-components",
|
|
3
|
-
"version": "2.2.
|
|
3
|
+
"version": "2.2.16",
|
|
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.
|
|
25
|
-
"@kmkf-fe-packages/kmkf-utils": "2.2.
|
|
24
|
+
"@kmkf-fe-packages/basic-components": "2.2.16",
|
|
25
|
+
"@kmkf-fe-packages/kmkf-utils": "2.2.16",
|
|
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": "ed128b5e709f85cd442856005196efceeb7c29c5",
|
|
45
45
|
"gitHooks": {
|
|
46
46
|
"pre-commit": "lint-staged"
|
|
47
47
|
}
|