@kmkf-fe-packages/services-components 2.10.18-rc.1 → 2.10.18-rc.10
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/Hooks/useColumnsConfig.js +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 +12 -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/expressCode.js +3 -0
- 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/constants/wdt.js +13 -3
- package/dist/esm/components/Common/index.js +20 -6
- package/dist/esm/components/CommonHeaderGood/index.js +43 -8
- package/dist/esm/components/CommonMultiStatus/index.js +27 -0
- package/dist/esm/components/JST/JstSendGood/index.js +9 -1
- package/dist/esm/components/LogisticsInterception/index.d.ts +1 -1
- package/dist/esm/components/LogisticsInterception/interceptLogisticsCustomerCode.d.ts +6 -3
- package/dist/esm/components/LogisticsInterception/interceptLogisticsCustomerCode.js +14 -15
- package/dist/esm/components/LogisticsMoreInterception/interceptLogisticsCustomerCode.js +2 -9
- package/dist/esm/components/Public/Goods/index.js +4 -0
- package/dist/esm/components/Remark/index.d.ts +4 -1
- package/dist/esm/components/Remark/index.js +46 -9
- package/dist/esm/constant.js +0 -3
- 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/dist/esm/type.d.ts +1 -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/BS/
|
|
3
|
+
export declare const newRenderColumnItem: (effects: any) => (item: any) => import("../components/BS/BsLogistics").default | import("../components/BS/BsSystemOrder").default | import("../components/CommonMultiStatus").default | import("../components/JST/JstSendGood").default | LogisticsInterception | LogisticsMoreInterception | import("../components/Public/Goods").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/TradeId").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/JstSupply").default | import("../components/BS/BsGoods").default | import("../components/BsE3/BsGoods").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 | 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/NodeDeadLine").default | import("../components/HandlerDeadLine").default | import("../components/NodeStayDuration").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/DXD/DxdShopSelect").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/Public/ReturnWarehouse").default | import("../components/GY/GyGoods").default | import("../components/KM/KmExchange").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 | import("../components/FlowOverallStatusSelect").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;
|
|
@@ -20,7 +20,7 @@ import { TEMPLATE_TYPE, DATA_SPLIT_COMPONENT_FIELDS_MAP } from "@kmkf-fe-package
|
|
|
20
20
|
|
|
21
21
|
//工单列表左对齐
|
|
22
22
|
var workOrderListAlignLeft = ["KM_VIDEO"];
|
|
23
|
-
var cantFilterType = ["CREATED_DATETIME", "UPDATE_DATETIME", "COMPLETED_DATETIME", "JST_LOGISTICS", "JST_ITEM_SELECT_THIRD", "JST_SUPPLY", "JST_SEND_GOOD", "TEXTAREA", "BS_SEND_GOOD", "BS_LOGISTICS", "BS_DELIVERY_NO", "WLN_SEND_GOOD", "WLN_LOGISTICS", "WDT_SEND_GOOD", "WDT_LOGISTICS", "KM_LOGISTICS", "REISSUE_LOGISTICS", "KM_SEND_GOOD", "KM_RETURN_WAREHOUSE", "GY_SEND_GOOD", "GY_LOGISTICS", "DXD_LOGISTICS", "DXD_SEND_GOOD"];
|
|
23
|
+
var cantFilterType = ["CREATED_DATETIME", "UPDATE_DATETIME", "COMPLETED_DATETIME", "JST_LOGISTICS", "JST_ITEM_SELECT_THIRD", "JST_SUPPLY", "JST_SEND_GOOD", "TEXTAREA", "BS_SEND_GOOD", "BS_LOGISTICS", "BS_DELIVERY_NO", "WLN_SEND_GOOD", "WLN_LOGISTICS", "WDT_SEND_GOOD", "WDT_LOGISTICS", "KM_LOGISTICS", "REISSUE_LOGISTICS", "KM_SEND_GOOD", "KM_RETURN_WAREHOUSE", "GY_SEND_GOOD", "GY_LOGISTICS", "DXD_LOGISTICS", "DXD_SEND_GOOD", "TTX_LOGISTICS", "TTX_SEND_GOOD"];
|
|
24
24
|
var cantShareFilterType = ["WORK_ORDER_ID_INPUT", "OPERATOR_INPUT", "HANDLER_INPUT", "COMPLETED_USER_INPUT"];
|
|
25
25
|
//需要拆行的组件
|
|
26
26
|
var SplitRowsType = Object.keys(DATA_SPLIT_COMPONENT_FIELDS_MAP);
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
declare type HasErpDataKeyType = "hasWln" | "hasWdt" | "hasBs" | "hasE3" | "hasJst" | "hasGy" | "hasJy" | "hasJky" | "hasDxd";
|
|
1
|
+
declare type HasErpDataKeyType = "hasWln" | "hasWdt" | "hasBs" | "hasE3" | "hasJst" | "hasGy" | "hasJy" | "hasJky" | "hasDxd" | "hasTtx";
|
|
2
2
|
declare function useGetHasErpData(reduxData: any): Record<HasErpDataKeyType, boolean>;
|
|
3
3
|
export default useGetHasErpData;
|
|
@@ -12,7 +12,7 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
|
|
|
12
12
|
function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
|
|
13
13
|
import { useEffect, useMemo, useState } from "react";
|
|
14
14
|
var getTemplate = function getTemplate(companyUserConfig) {
|
|
15
|
-
var _companyUserConfig$pl, _companyUserConfig$pl2, _companyUserConfig$pl3, _companyUserConfig$pl4, _companyUserConfig$pl5, _companyUserConfig$pl6, _companyUserConfig$pl7, _companyUserConfig$pl8, _companyUserConfig$pl9, _companyUserConfig$pl10, _companyUserConfig$pl11, _companyUserConfig$pl12, _companyUserConfig$pl13, _companyUserConfig$pl14, _companyUserConfig$pl15, _companyUserConfig$pl16, _companyUserConfig$pl17, _companyUserConfig$pl18, _companyUserConfig$pl19, _companyUserConfig$pl20, _companyUserConfig$pl21, _companyUserConfig$pl22, _companyUserConfig$pl23, _companyUserConfig$pl24;
|
|
15
|
+
var _companyUserConfig$pl, _companyUserConfig$pl2, _companyUserConfig$pl3, _companyUserConfig$pl4, _companyUserConfig$pl5, _companyUserConfig$pl6, _companyUserConfig$pl7, _companyUserConfig$pl8, _companyUserConfig$pl9, _companyUserConfig$pl10, _companyUserConfig$pl11, _companyUserConfig$pl12, _companyUserConfig$pl13, _companyUserConfig$pl14, _companyUserConfig$pl15, _companyUserConfig$pl16, _companyUserConfig$pl17, _companyUserConfig$pl18, _companyUserConfig$pl19, _companyUserConfig$pl20, _companyUserConfig$pl21, _companyUserConfig$pl22, _companyUserConfig$pl23, _companyUserConfig$pl24, _companyUserConfig$pl25, _companyUserConfig$pl26, _companyUserConfig$pl27;
|
|
16
16
|
return JSON.stringify({
|
|
17
17
|
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,
|
|
18
18
|
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,
|
|
@@ -27,7 +27,8 @@ var getTemplate = function getTemplate(companyUserConfig) {
|
|
|
27
27
|
"6O47IBXFR26FJF4HUQ7WGO4H",
|
|
28
28
|
//prod 陈健企业工单
|
|
29
29
|
"FHLSISEYFB76GAGKP2MCHSV5" //prod 大希地
|
|
30
|
-
].includes(companyUserConfig === null || companyUserConfig === void 0 ? void 0 : companyUserConfig.companyKey)
|
|
30
|
+
].includes(companyUserConfig === null || companyUserConfig === void 0 ? void 0 : companyUserConfig.companyKey),
|
|
31
|
+
hasTtx: (_companyUserConfig$pl25 = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : (_companyUserConfig$pl26 = companyUserConfig.plugins) === null || _companyUserConfig$pl26 === void 0 ? void 0 : (_companyUserConfig$pl27 = _companyUserConfig$pl26.ttx) === null || _companyUserConfig$pl27 === void 0 ? void 0 : _companyUserConfig$pl27.show) !== null && _companyUserConfig$pl25 !== void 0 ? _companyUserConfig$pl25 : false
|
|
31
32
|
});
|
|
32
33
|
};
|
|
33
34
|
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, queryJYLogisticsCompany, queryJKYLogisticsCompany, queryDXDLogisticsCompany } from "../../../service/api";
|
|
13
|
+
import { queryWdtLogisticsCompany, queryBsE3LogisticsCompany, queryJSTLogisticsCompany, queryWLNLogisticsCompany, queryGYLogisticsCompany, queryJYLogisticsCompany, queryJKYLogisticsCompany, queryDXDLogisticsCompany, queryTTXLogisticsCompany } from "../../../service/api";
|
|
14
14
|
function useGetErpLogisticsCompany(reduxData, notJudgedErp) {
|
|
15
15
|
var _useState = useState("loading"),
|
|
16
16
|
_useState2 = _slicedToArray(_useState, 2),
|
|
@@ -22,14 +22,14 @@ function useGetErpLogisticsCompany(reduxData, notJudgedErp) {
|
|
|
22
22
|
}, [hasErpData, notJudgedErp]);
|
|
23
23
|
var asyncQueryData = /*#__PURE__*/function () {
|
|
24
24
|
var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(hasErpData, notJudgedErp, isReload) {
|
|
25
|
-
var hasWdt, hasE3, hasJst, hasWln, hasGy, hasJy, hasJky, hasDxd, promises;
|
|
25
|
+
var hasWdt, hasE3, hasJst, hasWln, hasGy, hasJy, hasJky, hasDxd, hasTtx, promises;
|
|
26
26
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
27
27
|
while (1) switch (_context.prev = _context.next) {
|
|
28
28
|
case 0:
|
|
29
29
|
if (!isReload) {
|
|
30
30
|
setGlobalState("loading");
|
|
31
31
|
}
|
|
32
|
-
hasWdt = hasErpData.hasWdt, hasE3 = hasErpData.hasE3, hasJst = hasErpData.hasJst, hasWln = hasErpData.hasWln, hasGy = hasErpData.hasGy, hasJy = hasErpData.hasJy, hasJky = hasErpData.hasJky, hasDxd = hasErpData.hasDxd;
|
|
32
|
+
hasWdt = hasErpData.hasWdt, hasE3 = hasErpData.hasE3, hasJst = hasErpData.hasJst, hasWln = hasErpData.hasWln, hasGy = hasErpData.hasGy, hasJy = hasErpData.hasJy, hasJky = hasErpData.hasJky, hasDxd = hasErpData.hasDxd, hasTtx = hasErpData.hasTtx;
|
|
33
33
|
promises = [];
|
|
34
34
|
if (hasWdt || notJudgedErp) promises.push(queryWdtLogisticsCompany);
|
|
35
35
|
if (hasE3 || notJudgedErp) promises.push(queryBsE3LogisticsCompany);
|
|
@@ -39,24 +39,25 @@ function useGetErpLogisticsCompany(reduxData, notJudgedErp) {
|
|
|
39
39
|
if (hasJy || notJudgedErp) promises.push(queryJYLogisticsCompany);
|
|
40
40
|
if (hasJky || notJudgedErp) promises.push(queryJKYLogisticsCompany);
|
|
41
41
|
if (hasDxd || notJudgedErp) promises.push(queryDXDLogisticsCompany);
|
|
42
|
-
|
|
43
|
-
_context.
|
|
42
|
+
if (hasTtx || notJudgedErp) promises.push(queryTTXLogisticsCompany);
|
|
43
|
+
_context.prev = 12;
|
|
44
|
+
_context.next = 15;
|
|
44
45
|
return Promise.all(promises.map(function (promise) {
|
|
45
46
|
return promise();
|
|
46
47
|
}));
|
|
47
|
-
case
|
|
48
|
+
case 15:
|
|
48
49
|
setGlobalState("success");
|
|
49
|
-
_context.next =
|
|
50
|
+
_context.next = 21;
|
|
50
51
|
break;
|
|
51
|
-
case
|
|
52
|
-
_context.prev =
|
|
53
|
-
_context.t0 = _context["catch"](
|
|
52
|
+
case 18:
|
|
53
|
+
_context.prev = 18;
|
|
54
|
+
_context.t0 = _context["catch"](12);
|
|
54
55
|
setGlobalState("failed");
|
|
55
|
-
case
|
|
56
|
+
case 21:
|
|
56
57
|
case "end":
|
|
57
58
|
return _context.stop();
|
|
58
59
|
}
|
|
59
|
-
}, _callee, null, [[
|
|
60
|
+
}, _callee, null, [[12, 18]]);
|
|
60
61
|
}));
|
|
61
62
|
return function asyncQueryData(_x2, _x3, _x4) {
|
|
62
63
|
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, hasJy, hasJky, hasWln, hasDxd, promises;
|
|
26
|
+
var hasWdt, hasGy, hasJst, hasJy, hasJky, hasWln, hasDxd, hasTtx, promises;
|
|
27
27
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
28
28
|
while (1) switch (_context.prev = _context.next) {
|
|
29
29
|
case 0:
|
|
@@ -31,7 +31,7 @@ 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, hasJy = hasErpData.hasJy, hasJky = hasErpData.hasJky, hasWln = hasErpData.hasWln, hasDxd = hasErpData.hasDxd;
|
|
34
|
+
hasWdt = hasErpData.hasWdt, hasGy = hasErpData.hasGy, hasJst = hasErpData.hasJst, hasJy = hasErpData.hasJy, hasJky = hasErpData.hasJky, hasWln = hasErpData.hasWln, hasDxd = hasErpData.hasDxd, hasTtx = hasErpData.hasTtx;
|
|
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);
|
|
@@ -43,23 +43,26 @@ function useGetErpSendData(reduxData, notJudgedErp) {
|
|
|
43
43
|
promises.push(SendDataCenter.getInstance("dxd").fetchData);
|
|
44
44
|
promises.push(DxdSuppliersData.getInstance().fetchData);
|
|
45
45
|
}
|
|
46
|
-
|
|
46
|
+
if (hasTtx || notJudgedErp) {
|
|
47
|
+
promises.push(SendDataCenter.getInstance("ttx").fetchData);
|
|
48
|
+
}
|
|
49
|
+
_context.next = 14;
|
|
47
50
|
return Promise.all(promises.map(function (promise) {
|
|
48
51
|
return promise();
|
|
49
52
|
}));
|
|
50
|
-
case
|
|
53
|
+
case 14:
|
|
51
54
|
setGlobalState("success");
|
|
52
|
-
_context.next =
|
|
55
|
+
_context.next = 20;
|
|
53
56
|
break;
|
|
54
|
-
case
|
|
55
|
-
_context.prev =
|
|
57
|
+
case 17:
|
|
58
|
+
_context.prev = 17;
|
|
56
59
|
_context.t0 = _context["catch"](1);
|
|
57
60
|
setGlobalState("failed");
|
|
58
|
-
case
|
|
61
|
+
case 20:
|
|
59
62
|
case "end":
|
|
60
63
|
return _context.stop();
|
|
61
64
|
}
|
|
62
|
-
}, _callee, null, [[1,
|
|
65
|
+
}, _callee, null, [[1, 17]]);
|
|
63
66
|
}));
|
|
64
67
|
return function asyncQueryData(_x2, _x3, _x4) {
|
|
65
68
|
return _ref.apply(this, arguments);
|
|
@@ -128,6 +128,15 @@ var typeMap = {
|
|
|
128
128
|
platformType: "dxd",
|
|
129
129
|
companyDataType: "string",
|
|
130
130
|
companyCodeType: "arrayObject"
|
|
131
|
+
},
|
|
132
|
+
TTX_LOGISTICS: {
|
|
133
|
+
key: "ttxLogisticsList",
|
|
134
|
+
name: "通天晓",
|
|
135
|
+
company: "ttxLogisticsCompany",
|
|
136
|
+
code: "ttxLogisticsCode",
|
|
137
|
+
platformType: "ttx",
|
|
138
|
+
companyDataType: "string",
|
|
139
|
+
companyCodeType: "arrayObject"
|
|
131
140
|
}
|
|
132
141
|
};
|
|
133
142
|
var BsLogistics = /*#__PURE__*/_createClass(function BsLogistics(_options) {
|
|
@@ -17,7 +17,7 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
|
|
|
17
17
|
import React from "react";
|
|
18
18
|
import GetFormItem from "../../GetFormItem";
|
|
19
19
|
import ItemView from "../../../commonComponents/ItemView";
|
|
20
|
-
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, JKY_SYSTEM_ORDER_CONFIG, WDT_RETURN_BILL_NO_CONFIG, PLATFORM_AFTER_SALES_ORDER_CONFIG, DXD_SYSTEM_ORDER_CONFIG } from "@kmkf-fe-packages/kmkf-utils";
|
|
20
|
+
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, JKY_SYSTEM_ORDER_CONFIG, WDT_RETURN_BILL_NO_CONFIG, PLATFORM_AFTER_SALES_ORDER_CONFIG, DXD_SYSTEM_ORDER_CONFIG, TTX_SYSTEM_ORDER_CONFIG } from "@kmkf-fe-packages/kmkf-utils";
|
|
21
21
|
import { BsSystemOrder as SystemOrder } from "@kmkf-fe-packages/basic-components";
|
|
22
22
|
import { BsSystemOrderTable } from "../../Common";
|
|
23
23
|
import { BsHeaderChild } from "../common/index";
|
|
@@ -35,7 +35,8 @@ var typeMap = {
|
|
|
35
35
|
JKY_SYSTEM_ORDER: JKY_SYSTEM_ORDER_CONFIG,
|
|
36
36
|
WDT_RETURN_BILL_NO: WDT_RETURN_BILL_NO_CONFIG,
|
|
37
37
|
PLATFORM_AFTER_SALES_ORDER: PLATFORM_AFTER_SALES_ORDER_CONFIG,
|
|
38
|
-
DXD_SYSTEM_ORDER: DXD_SYSTEM_ORDER_CONFIG
|
|
38
|
+
DXD_SYSTEM_ORDER: DXD_SYSTEM_ORDER_CONFIG,
|
|
39
|
+
TTX_SYSTEM_ORDER: TTX_SYSTEM_ORDER_CONFIG
|
|
39
40
|
};
|
|
40
41
|
var BsSystemOrder = /*#__PURE__*/_createClass(function BsSystemOrder(options) {
|
|
41
42
|
var _this = this,
|
|
@@ -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, getJyColumns, getSkxColumns, getJkyColumns, getDxdColumns } from "@kmkf-fe-packages/basic-components";
|
|
10
|
+
import { getJstColumns, getWlnColumns, getGyColumns, getWdtColumns, getKmColumns, getJyColumns, getSkxColumns, getJkyColumns, getDxdColumns, getTtxColumns } 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(_objectSpread(_objectSpread(_objectSpread({}, system()), bs({
|
|
16
|
+
return _objectSpread(_objectSpread(_objectSpread(_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,
|
|
@@ -32,6 +32,8 @@ export var getColumnsMap = function getColumnsMap(args) {
|
|
|
32
32
|
disabled: true
|
|
33
33
|
})), getDxdColumns({
|
|
34
34
|
disabled: true
|
|
35
|
+
})), getTtxColumns({
|
|
36
|
+
disabled: true
|
|
35
37
|
})), getSkxColumns({})), {}, {
|
|
36
38
|
default: defaultColumns({
|
|
37
39
|
text: text
|
|
@@ -1,3 +1,9 @@
|
|
|
1
|
+
function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
|
|
2
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
3
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
4
|
+
function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
5
|
+
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
|
|
6
|
+
function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
|
|
1
7
|
import React from "react";
|
|
2
8
|
import { Image } from "antd";
|
|
3
9
|
import { CopyTextIcon } from "@kmkf-fe-packages/basic-components";
|
|
@@ -169,7 +175,7 @@ var getColumns = function getColumns(_ref) {
|
|
|
169
175
|
width: 80
|
|
170
176
|
}, {
|
|
171
177
|
dataIndex: "returnPrice",
|
|
172
|
-
title: "".concat(text, "\u9000\
|
|
178
|
+
title: "".concat(text, "\u9000\u6B3E\u91D1\u989D"),
|
|
173
179
|
align: "center",
|
|
174
180
|
ellipsis: true,
|
|
175
181
|
width: 100
|
|
@@ -315,7 +321,7 @@ var getColumns = function getColumns(_ref) {
|
|
|
315
321
|
width: 150
|
|
316
322
|
}, {
|
|
317
323
|
dataIndex: "goodsNo",
|
|
318
|
-
title: "
|
|
324
|
+
title: "货品编号",
|
|
319
325
|
align: "center",
|
|
320
326
|
ellipsis: true,
|
|
321
327
|
width: 150
|
|
@@ -406,7 +412,11 @@ var getColumns = function getColumns(_ref) {
|
|
|
406
412
|
}]
|
|
407
413
|
};
|
|
408
414
|
//旺店通补发商品信息
|
|
409
|
-
data["WDT_REISSUE_GOODS"] = data["WDT_GOODS"]
|
|
415
|
+
data["WDT_REISSUE_GOODS"] = data["WDT_GOODS"].map(function (column) {
|
|
416
|
+
return column.dataIndex === "orderPrice" ? _objectSpread(_objectSpread({}, column), {}, {
|
|
417
|
+
title: "补发金额"
|
|
418
|
+
}) : column;
|
|
419
|
+
});
|
|
410
420
|
return data;
|
|
411
421
|
};
|
|
412
422
|
export default getColumns;
|
|
@@ -6,6 +6,11 @@ function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableTo
|
|
|
6
6
|
function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
7
7
|
function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
|
|
8
8
|
function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
|
|
9
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
10
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
11
|
+
function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
12
|
+
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
|
|
13
|
+
function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
|
|
9
14
|
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
|
|
10
15
|
function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
11
16
|
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
|
|
@@ -21,10 +26,10 @@ import { CopyToClipboard } from "react-copy-to-clipboard";
|
|
|
21
26
|
import styles from "./index.module.less";
|
|
22
27
|
import defaultImg from "./img/default-img.png";
|
|
23
28
|
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, JY_SYSTEM_ORDER_CONFIG, JKY_SYSTEM_ORDER_CONFIG, WDT_RETURN_BILL_NO_CONFIG, PLATFORM_AFTER_SALES_ORDER_CONFIG, DXD_SYSTEM_ORDER_CONFIG, msgTypeCh, getMapping, columnsGoodsList } from "@kmkf-fe-packages/kmkf-utils";
|
|
29
|
+
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, JKY_SYSTEM_ORDER_CONFIG, WDT_RETURN_BILL_NO_CONFIG, PLATFORM_AFTER_SALES_ORDER_CONFIG, DXD_SYSTEM_ORDER_CONFIG, TTX_SYSTEM_ORDER_CONFIG, msgTypeCh, getMapping, columnsGoodsList } from "@kmkf-fe-packages/kmkf-utils";
|
|
25
30
|
import { getColumnsMap } from "./constants/columnsBaseInfoMap";
|
|
26
31
|
import { VideoCameraTwoTone } from "@ant-design/icons";
|
|
27
|
-
import { ApaasImage } from "@kmkf-fe-packages/basic-components";
|
|
32
|
+
import { ApaasImage, resolveColumnWidth } from "@kmkf-fe-packages/basic-components";
|
|
28
33
|
var Paragraph = Typography.Paragraph;
|
|
29
34
|
export var getFormItem = function getFormItem(_ref) {
|
|
30
35
|
var name = _ref.name,
|
|
@@ -505,7 +510,9 @@ export var BsGoodsTable = function BsGoodsTable(_ref11) {
|
|
|
505
510
|
});
|
|
506
511
|
// 如果列应该显示(show不为false)或者有验证器,则返回对应的列配置
|
|
507
512
|
if (currentCol && (col.show !== false || currentCol !== null && currentCol !== void 0 && currentCol.validator)) {
|
|
508
|
-
return currentCol
|
|
513
|
+
return _objectSpread(_objectSpread({}, currentCol), {}, {
|
|
514
|
+
width: resolveColumnWidth(col.width, currentCol.width)
|
|
515
|
+
});
|
|
509
516
|
}
|
|
510
517
|
return undefined;
|
|
511
518
|
}).filter(Boolean);
|
|
@@ -522,6 +529,11 @@ export var BsGoodsTable = function BsGoodsTable(_ref11) {
|
|
|
522
529
|
}].concat(_toConsumableArray(baseInfoColumns));
|
|
523
530
|
return columnList;
|
|
524
531
|
}, [showHeader, list]);
|
|
532
|
+
var tableScrollX = useMemo(function () {
|
|
533
|
+
return newColumns.reduce(function (total, column) {
|
|
534
|
+
return total + (Number(column.width) || 0);
|
|
535
|
+
}, 0);
|
|
536
|
+
}, [newColumns]);
|
|
525
537
|
return /*#__PURE__*/React.createElement(Table, {
|
|
526
538
|
columns: newColumns,
|
|
527
539
|
dataSource: list,
|
|
@@ -529,7 +541,7 @@ export var BsGoodsTable = function BsGoodsTable(_ref11) {
|
|
|
529
541
|
size: "small",
|
|
530
542
|
pagination: false,
|
|
531
543
|
scroll: {
|
|
532
|
-
x:
|
|
544
|
+
x: tableScrollX
|
|
533
545
|
},
|
|
534
546
|
locale: {
|
|
535
547
|
emptyText: "暂无数据"
|
|
@@ -788,7 +800,8 @@ export var BsSystemOrderTable = function BsSystemOrderTable(_ref14) {
|
|
|
788
800
|
JKY_SYSTEM_ORDER: JKY_SYSTEM_ORDER_CONFIG.columns,
|
|
789
801
|
WDT_RETURN_BILL_NO: WDT_RETURN_BILL_NO_CONFIG.columns,
|
|
790
802
|
PLATFORM_AFTER_SALES_ORDER: PLATFORM_AFTER_SALES_ORDER_CONFIG.columns,
|
|
791
|
-
DXD_SYSTEM_ORDER: DXD_SYSTEM_ORDER_CONFIG.columns
|
|
803
|
+
DXD_SYSTEM_ORDER: DXD_SYSTEM_ORDER_CONFIG.columns,
|
|
804
|
+
TTX_SYSTEM_ORDER: TTX_SYSTEM_ORDER_CONFIG.columns
|
|
792
805
|
};
|
|
793
806
|
var rowKeyMap = {
|
|
794
807
|
BS_SYSTEM_ORDER: "billNo",
|
|
@@ -802,7 +815,8 @@ export var BsSystemOrderTable = function BsSystemOrderTable(_ref14) {
|
|
|
802
815
|
JKY_SYSTEM_ORDER: "tradeNo",
|
|
803
816
|
WDT_RETURN_BILL_NO: "refundNo",
|
|
804
817
|
PLATFORM_AFTER_SALES_ORDER: "afterSaleOrderId",
|
|
805
|
-
DXD_SYSTEM_ORDER: "orderNo"
|
|
818
|
+
DXD_SYSTEM_ORDER: "orderNo",
|
|
819
|
+
TTX_SYSTEM_ORDER: "code"
|
|
806
820
|
};
|
|
807
821
|
var rowSelection = {
|
|
808
822
|
type: isRadio ? "radio" : "checkbox",
|
|
@@ -18,8 +18,8 @@ import ItemView from "../../commonComponents/ItemView";
|
|
|
18
18
|
import { isNull, BS_E3_BOOLEAN_STATUS_MAP } from "@kmkf-fe-packages/kmkf-utils";
|
|
19
19
|
import { BsHeaderPic, BsHeaderChild } from "../BS/common";
|
|
20
20
|
import ReissueGift from "../BsE3/ReissueGift";
|
|
21
|
-
import { erpColumnsMap } from "@kmkf-fe-packages/basic-components";
|
|
22
|
-
import { getJstColumns, getKmColumns, getDxdColumns } from "@kmkf-fe-packages/basic-components";
|
|
21
|
+
import { erpColumnsMap, resolveColumnWidth } from "@kmkf-fe-packages/basic-components";
|
|
22
|
+
import { getJstColumns, getKmColumns, getDxdColumns, getTtxColumns } from "@kmkf-fe-packages/basic-components";
|
|
23
23
|
var isNullNotFalse = function isNullNotFalse(val) {
|
|
24
24
|
if (val === false) return false;
|
|
25
25
|
return isNull(val);
|
|
@@ -184,7 +184,7 @@ var GoodHeaderMap = {
|
|
|
184
184
|
},
|
|
185
185
|
goodsNo: {
|
|
186
186
|
component: BsHeaderChild,
|
|
187
|
-
name: "
|
|
187
|
+
name: "货品编号",
|
|
188
188
|
key: "goodsNo",
|
|
189
189
|
width: 150
|
|
190
190
|
},
|
|
@@ -300,7 +300,7 @@ var GoodHeaderMap = {
|
|
|
300
300
|
itemKey: {
|
|
301
301
|
oid: "原始子单号",
|
|
302
302
|
goodsName: "货品名称",
|
|
303
|
-
goodsNo: "
|
|
303
|
+
goodsNo: "货品编号",
|
|
304
304
|
specName: "规格名称",
|
|
305
305
|
specNo: "商家编码",
|
|
306
306
|
specCode: "规格编号",
|
|
@@ -553,12 +553,19 @@ var GoodHeaderMap = {
|
|
|
553
553
|
name: "商品类型",
|
|
554
554
|
key: "type",
|
|
555
555
|
width: 100,
|
|
556
|
-
|
|
556
|
+
transformValue: function transformValue(val) {
|
|
557
557
|
var typeMap = {
|
|
558
558
|
"1": "单品",
|
|
559
559
|
"2": "组合装"
|
|
560
560
|
};
|
|
561
|
-
return
|
|
561
|
+
return typeMap[val];
|
|
562
|
+
},
|
|
563
|
+
renderExport: function renderExport(val) {
|
|
564
|
+
var typeMap = {
|
|
565
|
+
"1": "单品",
|
|
566
|
+
"2": "组合装"
|
|
567
|
+
};
|
|
568
|
+
return typeMap[val];
|
|
562
569
|
}
|
|
563
570
|
},
|
|
564
571
|
giftType: {
|
|
@@ -2598,6 +2605,21 @@ var GoodHeaderMap = {
|
|
|
2598
2605
|
return acc;
|
|
2599
2606
|
}, {})
|
|
2600
2607
|
},
|
|
2608
|
+
TTX_GOODS: {
|
|
2609
|
+
headerMap: getTtxColumns()["TTX_GOODS"].reduce(function (acc, item) {
|
|
2610
|
+
acc[item.dataIndex] = _objectSpread(_objectSpread({}, item.headerMapping || {}), {}, {
|
|
2611
|
+
component: orderGoodsHeaderComponentMap[item.headerComponentType] || BsHeaderChild,
|
|
2612
|
+
name: item.title,
|
|
2613
|
+
key: item.dataIndex,
|
|
2614
|
+
width: item.width || 150
|
|
2615
|
+
});
|
|
2616
|
+
return acc;
|
|
2617
|
+
}, {}),
|
|
2618
|
+
itemKey: getTtxColumns()["TTX_GOODS"].reduce(function (acc, item) {
|
|
2619
|
+
acc[item.dataIndex] = item.title;
|
|
2620
|
+
return acc;
|
|
2621
|
+
}, {})
|
|
2622
|
+
},
|
|
2601
2623
|
JKY_REISSUE_GOODS: {
|
|
2602
2624
|
headerMap: {
|
|
2603
2625
|
goodsNo: {
|
|
@@ -2727,7 +2749,16 @@ var GoodHeaderMap = {
|
|
|
2727
2749
|
moneyKey: "sellTotal"
|
|
2728
2750
|
}
|
|
2729
2751
|
};
|
|
2730
|
-
GoodHeaderMap["WDT_REISSUE_GOODS"] = GoodHeaderMap["WDT_GOODS"]
|
|
2752
|
+
GoodHeaderMap["WDT_REISSUE_GOODS"] = _objectSpread(_objectSpread({}, GoodHeaderMap["WDT_GOODS"]), {}, {
|
|
2753
|
+
headerMap: _objectSpread(_objectSpread({}, GoodHeaderMap["WDT_GOODS"].headerMap), {}, {
|
|
2754
|
+
orderPrice: _objectSpread(_objectSpread({}, GoodHeaderMap["WDT_GOODS"].headerMap.orderPrice), {}, {
|
|
2755
|
+
name: "补发金额"
|
|
2756
|
+
})
|
|
2757
|
+
}),
|
|
2758
|
+
itemKey: _objectSpread(_objectSpread({}, GoodHeaderMap["WDT_GOODS"].itemKey), {}, {
|
|
2759
|
+
orderPrice: "补发金额"
|
|
2760
|
+
})
|
|
2761
|
+
});
|
|
2731
2762
|
var CommonHeaderGoods = /*#__PURE__*/function () {
|
|
2732
2763
|
function CommonHeaderGoods(options) {
|
|
2733
2764
|
var _this = this,
|
|
@@ -2841,11 +2872,15 @@ var CommonHeaderGoods = /*#__PURE__*/function () {
|
|
|
2841
2872
|
var _this2$itemKey;
|
|
2842
2873
|
var headerConfig = GoodHeaderMap[_this2.type].headerMap[key];
|
|
2843
2874
|
var isStringConfig = typeof headerConfig === "string";
|
|
2875
|
+
var configuredColumn = isObjectArray ? showHeader.find(function (item) {
|
|
2876
|
+
return item.dataIndex === key;
|
|
2877
|
+
}) : undefined;
|
|
2878
|
+
var defaultWidth = isStringConfig ? 80 : headerConfig.width || 80;
|
|
2844
2879
|
return {
|
|
2845
2880
|
component: isStringConfig ? BsHeaderChild : headerConfig.component || BsHeaderChild,
|
|
2846
2881
|
name: isStringConfig ? headerConfig : ((_this2$itemKey = _this2.itemKey) === null || _this2$itemKey === void 0 ? void 0 : _this2$itemKey[key]) || headerConfig.name,
|
|
2847
2882
|
key: isStringConfig ? key : headerConfig.key || key,
|
|
2848
|
-
width:
|
|
2883
|
+
width: resolveColumnWidth(configuredColumn === null || configuredColumn === void 0 ? void 0 : configuredColumn.width, defaultWidth),
|
|
2849
2884
|
transformValue: isStringConfig ? undefined : headerConfig.transformValue,
|
|
2850
2885
|
renderExport: isStringConfig ? undefined : headerConfig.renderExport
|
|
2851
2886
|
};
|
|
@@ -242,6 +242,33 @@ var typeMap = {
|
|
|
242
242
|
failValue: "失败",
|
|
243
243
|
dataType: "array_object"
|
|
244
244
|
},
|
|
245
|
+
TTX_WAREHOUSING_STATUS: {
|
|
246
|
+
options: [{
|
|
247
|
+
value: "1",
|
|
248
|
+
label: "未入库",
|
|
249
|
+
color: "#ff4d4f"
|
|
250
|
+
}, {
|
|
251
|
+
value: "2",
|
|
252
|
+
label: "部分入库",
|
|
253
|
+
color: "#e7780f"
|
|
254
|
+
}, {
|
|
255
|
+
value: "3",
|
|
256
|
+
label: "已入库",
|
|
257
|
+
color: "#52c41a"
|
|
258
|
+
}, {
|
|
259
|
+
label: "已入库-多收",
|
|
260
|
+
value: "4",
|
|
261
|
+
color: "#e7780f"
|
|
262
|
+
}],
|
|
263
|
+
key: "ttxInStockStatusItemList",
|
|
264
|
+
code: "ttxInStockStatusList",
|
|
265
|
+
name: "通天晓商品入库状态",
|
|
266
|
+
type: 2,
|
|
267
|
+
valueKey: "status",
|
|
268
|
+
idKey: "sourceTradeNo",
|
|
269
|
+
failValue: "失败",
|
|
270
|
+
dataType: "array_object"
|
|
271
|
+
},
|
|
245
272
|
KM_WAREHOUSING_STATUS: {
|
|
246
273
|
options: [{
|
|
247
274
|
value: "0",
|
|
@@ -99,6 +99,14 @@ var typeMap = {
|
|
|
99
99
|
sendName: "dxdSendName",
|
|
100
100
|
platformType: "dxd",
|
|
101
101
|
dataType: "weakenArray"
|
|
102
|
+
},
|
|
103
|
+
TTX_SEND_GOOD: {
|
|
104
|
+
key: "ttxSendGood",
|
|
105
|
+
name: "ttx",
|
|
106
|
+
sendId: "ttxSendId",
|
|
107
|
+
sendName: "ttxSendName",
|
|
108
|
+
platformType: "ttx",
|
|
109
|
+
dataType: "weakenArray"
|
|
102
110
|
}
|
|
103
111
|
};
|
|
104
112
|
var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(_options) {
|
|
@@ -237,7 +245,7 @@ var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(_options) {
|
|
|
237
245
|
});
|
|
238
246
|
};
|
|
239
247
|
}
|
|
240
|
-
} : ["WDT_SEND_GOOD", "BS_E3_SEND_GOOD", "KM_SEND_GOOD", "GY_SEND_GOOD", "JY_SEND_GOOD", "JKY_SEND_GOOD", "DXD_SEND_GOOD"].includes(_this.type) ? {
|
|
248
|
+
} : ["WDT_SEND_GOOD", "BS_E3_SEND_GOOD", "KM_SEND_GOOD", "GY_SEND_GOOD", "JY_SEND_GOOD", "JKY_SEND_GOOD", "DXD_SEND_GOOD", "TTX_SEND_GOOD"].includes(_this.type) ? {
|
|
241
249
|
searchDefaultConditions: SYMBOL.in,
|
|
242
250
|
type: item.type,
|
|
243
251
|
id: "".concat(item.id, "_").concat((_typeMap$_this$type9 = typeMap[_this.type]) === null || _typeMap$_this$type9 === void 0 ? void 0 : _typeMap$_this$type9.sendName),
|
|
@@ -62,7 +62,7 @@ declare class Logistics implements ComponentInterface {
|
|
|
62
62
|
interceptSnapshot: any;
|
|
63
63
|
interceptState: any;
|
|
64
64
|
interceptApiStatusReason: any;
|
|
65
|
-
interceptLogisticsCustomerCode:
|
|
65
|
+
interceptLogisticsCustomerCode: string;
|
|
66
66
|
};
|
|
67
67
|
renderPc: () => null;
|
|
68
68
|
renderExport: () => null;
|
|
@@ -16,12 +16,15 @@ declare class InterceptLogisticsCustomerCode implements ComponentInterface {
|
|
|
16
16
|
children: ComponentInterface[];
|
|
17
17
|
dataType: ComponentInterface["dataType"];
|
|
18
18
|
options: ComponentInterface["options"];
|
|
19
|
+
optionsMap: {
|
|
20
|
+
[key: string]: string;
|
|
21
|
+
};
|
|
19
22
|
constructor(options: PickOption);
|
|
20
|
-
getComponentValue: (record: Record) =>
|
|
23
|
+
getComponentValue: (record: Record) => string;
|
|
21
24
|
renderClient: (record: Record) => React.JSX.Element | null;
|
|
22
|
-
renderPc: (_value: any, record: Record) =>
|
|
25
|
+
renderPc: (_value: any, record: Record) => string;
|
|
23
26
|
renderLog: (record: Record) => any;
|
|
24
|
-
renderExport: (_value: any, record: Record) =>
|
|
27
|
+
renderExport: (_value: any, record: Record) => string;
|
|
25
28
|
editRender: () => null;
|
|
26
29
|
filterConfig: (item: ColumnConfig) => {
|
|
27
30
|
searchDefaultConditions: "in";
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
|
|
2
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
3
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
2
4
|
function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
|
|
3
5
|
function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
|
|
4
6
|
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
|
|
@@ -7,7 +9,7 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
|
|
|
7
9
|
function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
|
|
8
10
|
import React from "react";
|
|
9
11
|
import ItemView from "../../commonComponents/ItemView";
|
|
10
|
-
import { filterFn as _filterFn, isNull, LogisticsAddressData } from "@kmkf-fe-packages/kmkf-utils";
|
|
12
|
+
import { filterFn as _filterFn, getJdCustomerCodeOptions, isNull, LogisticsAddressData } from "@kmkf-fe-packages/kmkf-utils";
|
|
11
13
|
import { SYMBOL } from "../../constant";
|
|
12
14
|
var InterceptLogisticsCustomerCode = /*#__PURE__*/_createClass(function InterceptLogisticsCustomerCode(options) {
|
|
13
15
|
var _this = this;
|
|
@@ -27,26 +29,27 @@ var InterceptLogisticsCustomerCode = /*#__PURE__*/_createClass(function Intercep
|
|
|
27
29
|
_defineProperty(this, "children", void 0);
|
|
28
30
|
_defineProperty(this, "dataType", void 0);
|
|
29
31
|
_defineProperty(this, "options", void 0);
|
|
32
|
+
_defineProperty(this, "optionsMap", void 0);
|
|
30
33
|
_defineProperty(this, "getComponentValue", function (record) {
|
|
31
|
-
return record === null || record === void 0 ? void 0 : record[_this.id];
|
|
34
|
+
return _this.optionsMap[record === null || record === void 0 ? void 0 : record[_this.id]];
|
|
32
35
|
});
|
|
33
36
|
_defineProperty(this, "renderClient", function (record) {
|
|
34
37
|
return !isNull(record === null || record === void 0 ? void 0 : record[_this.id]) ? /*#__PURE__*/React.createElement(ItemView, {
|
|
35
38
|
id: _this.id,
|
|
36
39
|
label: _this.name,
|
|
37
|
-
value: record[_this.id]
|
|
40
|
+
value: _this.optionsMap[record[_this.id]]
|
|
38
41
|
}) : null;
|
|
39
42
|
});
|
|
40
43
|
_defineProperty(this, "renderPc", function (_value, record) {
|
|
41
|
-
var
|
|
42
|
-
return (
|
|
44
|
+
var _this$optionsMap$reco;
|
|
45
|
+
return (_this$optionsMap$reco = _this.optionsMap[record === null || record === void 0 ? void 0 : record[_this.id]]) !== null && _this$optionsMap$reco !== void 0 ? _this$optionsMap$reco : "--";
|
|
43
46
|
});
|
|
44
47
|
_defineProperty(this, "renderLog", function (record) {
|
|
45
48
|
return isNull(record === null || record === void 0 ? void 0 : record[_this.id]) ? null : record[_this.id];
|
|
46
49
|
});
|
|
47
50
|
_defineProperty(this, "renderExport", function (_value, record) {
|
|
48
|
-
var
|
|
49
|
-
return (
|
|
51
|
+
var _this$optionsMap$reco2;
|
|
52
|
+
return (_this$optionsMap$reco2 = _this.optionsMap[record === null || record === void 0 ? void 0 : record[_this.id]]) !== null && _this$optionsMap$reco2 !== void 0 ? _this$optionsMap$reco2 : "--";
|
|
50
53
|
});
|
|
51
54
|
_defineProperty(this, "editRender", function () {
|
|
52
55
|
return null;
|
|
@@ -91,13 +94,9 @@ var InterceptLogisticsCustomerCode = /*#__PURE__*/_createClass(function Intercep
|
|
|
91
94
|
this.children = [];
|
|
92
95
|
this.effects = options === null || options === void 0 ? void 0 : options.effects;
|
|
93
96
|
this.dataType = "string";
|
|
94
|
-
this.options = (LogisticsAddressData.getInstance().getAddressData() || [])
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
label: item.remark ? "".concat(item.customerCode, "\uFF08").concat(item.remark, "\uFF09") : item.customerCode,
|
|
99
|
-
value: item.customerCode
|
|
100
|
-
};
|
|
101
|
-
});
|
|
97
|
+
this.options = getJdCustomerCodeOptions(LogisticsAddressData.getInstance().getAddressData() || []);
|
|
98
|
+
this.optionsMap = (this.options || []).reduce(function (cur, nxt) {
|
|
99
|
+
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, nxt.value, nxt.label));
|
|
100
|
+
}, {});
|
|
102
101
|
});
|
|
103
102
|
export default InterceptLogisticsCustomerCode;
|
|
@@ -6,7 +6,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
|
|
|
6
6
|
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
|
|
7
7
|
function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
|
|
8
8
|
import React from "react";
|
|
9
|
-
import { filterFn as _filterFn, LogisticsAddressData } from "@kmkf-fe-packages/kmkf-utils";
|
|
9
|
+
import { filterFn as _filterFn, getJdCustomerCodeOptions, LogisticsAddressData } from "@kmkf-fe-packages/kmkf-utils";
|
|
10
10
|
import { SYMBOL } from "../../constant";
|
|
11
11
|
var InterceptLogisticsCustomerCode = /*#__PURE__*/_createClass(function InterceptLogisticsCustomerCode(options) {
|
|
12
12
|
var _this = this;
|
|
@@ -96,13 +96,6 @@ var InterceptLogisticsCustomerCode = /*#__PURE__*/_createClass(function Intercep
|
|
|
96
96
|
this.children = [];
|
|
97
97
|
this.effects = options === null || options === void 0 ? void 0 : options.effects;
|
|
98
98
|
this.dataType = "string";
|
|
99
|
-
this.options = (LogisticsAddressData.getInstance().getAddressData() || [])
|
|
100
|
-
return item.cpCode === "JD" && item.customerCode;
|
|
101
|
-
}).map(function (item) {
|
|
102
|
-
return {
|
|
103
|
-
label: item.remark ? "".concat(item.customerCode, "\uFF08").concat(item.remark, "\uFF09") : item.customerCode,
|
|
104
|
-
value: item.customerCode
|
|
105
|
-
};
|
|
106
|
-
});
|
|
99
|
+
this.options = getJdCustomerCodeOptions(LogisticsAddressData.getInstance().getAddressData() || []);
|
|
107
100
|
});
|
|
108
101
|
export default InterceptLogisticsCustomerCode;
|
|
@@ -17,9 +17,12 @@ declare class ERemark implements ComponentInterface {
|
|
|
17
17
|
formField: string;
|
|
18
18
|
canSort: boolean;
|
|
19
19
|
children: ComponentInterface[];
|
|
20
|
+
effects: ComponentInterface['effects'];
|
|
20
21
|
dataType: ComponentInterface['dataType'];
|
|
21
22
|
constructor(options: PickOption);
|
|
22
|
-
|
|
23
|
+
getShop: (record?: Record) => any;
|
|
24
|
+
isYouzan: (record?: Record) => boolean;
|
|
25
|
+
render: (value: Value, isYouzan?: boolean) => React.JSX.Element;
|
|
23
26
|
renderClient: (record: Record) => React.JSX.Element | null;
|
|
24
27
|
renderPc: (value: unknown, record: Record) => React.JSX.Element;
|
|
25
28
|
renderLog: (r: Record) => React.JSX.Element | null;
|
|
@@ -1,4 +1,11 @@
|
|
|
1
1
|
function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
|
|
2
|
+
function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
|
|
3
|
+
function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
4
|
+
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
|
|
5
|
+
function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
|
|
6
|
+
function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
|
|
7
|
+
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
|
|
8
|
+
function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
|
|
2
9
|
function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
|
|
3
10
|
function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
|
|
4
11
|
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
|
|
@@ -6,7 +13,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
|
|
|
6
13
|
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
|
|
7
14
|
function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
|
|
8
15
|
import React from 'react';
|
|
9
|
-
import { Remark } from '@kmkf-fe-packages/basic-components';
|
|
16
|
+
import { Remark, YouzanStar } from '@kmkf-fe-packages/basic-components';
|
|
10
17
|
import GetFormItem from "../GetFormItem";
|
|
11
18
|
import trade0 from "./flag/trade-icon-flag-0.png";
|
|
12
19
|
import trade1 from "./flag/trade-icon-flag-1.png";
|
|
@@ -16,7 +23,7 @@ import trade4 from "./flag/trade-icon-flag-4.png";
|
|
|
16
23
|
import trade5 from "./flag/trade-icon-flag-5.png";
|
|
17
24
|
import get from 'lodash/get';
|
|
18
25
|
import ItemView from "../../commonComponents/ItemView";
|
|
19
|
-
import { isNull, filterFn as _filterFn } from '@kmkf-fe-packages/kmkf-utils';
|
|
26
|
+
import { isNull, filterFn as _filterFn, isYouzanShop, normalizeYouzanStar } from '@kmkf-fe-packages/kmkf-utils';
|
|
20
27
|
import { SYMBOL, batchInput, SEARCH_OPTIONS } from "../../constant";
|
|
21
28
|
var ERemark = /*#__PURE__*/_createClass(function ERemark(options) {
|
|
22
29
|
var _this = this,
|
|
@@ -34,14 +41,30 @@ var ERemark = /*#__PURE__*/_createClass(function ERemark(options) {
|
|
|
34
41
|
_defineProperty(this, "formField", void 0);
|
|
35
42
|
_defineProperty(this, "canSort", void 0);
|
|
36
43
|
_defineProperty(this, "children", void 0);
|
|
44
|
+
_defineProperty(this, "effects", void 0);
|
|
37
45
|
_defineProperty(this, "dataType", void 0);
|
|
46
|
+
_defineProperty(this, "getShop", function (record) {
|
|
47
|
+
var _this$effects, _this$effects2, _this$effects2$form, _this$effects3, _this$effects3$shopLi;
|
|
48
|
+
var shopId = (record === null || record === void 0 ? void 0 : record.shopId) || ((_this$effects = _this.effects) === null || _this$effects === void 0 ? void 0 : _this$effects.shopId) || ((_this$effects2 = _this.effects) === null || _this$effects2 === void 0 ? void 0 : (_this$effects2$form = _this$effects2.form) === null || _this$effects2$form === void 0 ? void 0 : _this$effects2$form.getFieldValue('shopId'));
|
|
49
|
+
return (_this$effects3 = _this.effects) === null || _this$effects3 === void 0 ? void 0 : (_this$effects3$shopLi = _this$effects3.shopList) === null || _this$effects3$shopLi === void 0 ? void 0 : _this$effects3$shopLi.find(function (shop) {
|
|
50
|
+
return shop.shopId === shopId;
|
|
51
|
+
});
|
|
52
|
+
});
|
|
53
|
+
_defineProperty(this, "isYouzan", function (record) {
|
|
54
|
+
return isYouzanShop(_this.getShop(record));
|
|
55
|
+
});
|
|
38
56
|
_defineProperty(this, "render", function (value) {
|
|
57
|
+
var isYouzan = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
|
|
39
58
|
var index = get(value, 'flag');
|
|
40
59
|
return /*#__PURE__*/React.createElement("div", {
|
|
41
60
|
style: {
|
|
42
61
|
display: 'inline-block'
|
|
43
62
|
}
|
|
44
|
-
},
|
|
63
|
+
}, isYouzan ? normalizeYouzanStar(index) ? /*#__PURE__*/React.createElement(YouzanStar, {
|
|
64
|
+
compact: true,
|
|
65
|
+
disabled: true,
|
|
66
|
+
value: index
|
|
67
|
+
}) : null : index !== undefined && /*#__PURE__*/React.createElement("img", {
|
|
45
68
|
src: _this.imgList[Number(index)]
|
|
46
69
|
}), /*#__PURE__*/React.createElement("span", null, get(value, 'remark')));
|
|
47
70
|
});
|
|
@@ -49,7 +72,7 @@ var ERemark = /*#__PURE__*/_createClass(function ERemark(options) {
|
|
|
49
72
|
return !isNull(record === null || record === void 0 ? void 0 : record[_this.id]) ? /*#__PURE__*/React.createElement(ItemView, {
|
|
50
73
|
id: _this.id,
|
|
51
74
|
label: _this.name,
|
|
52
|
-
value: _this.render(record === null || record === void 0 ? void 0 : record[_this.id])
|
|
75
|
+
value: _this.render(record === null || record === void 0 ? void 0 : record[_this.id], _this.isYouzan(record))
|
|
53
76
|
}) : null;
|
|
54
77
|
});
|
|
55
78
|
_defineProperty(this, "renderPc", function (value, record) {
|
|
@@ -57,11 +80,16 @@ var ERemark = /*#__PURE__*/_createClass(function ERemark(options) {
|
|
|
57
80
|
return /*#__PURE__*/React.createElement("span", null, "--");
|
|
58
81
|
}
|
|
59
82
|
var index = get(record, "".concat(_this.id, "_flag"));
|
|
83
|
+
var isYouzan = _this.isYouzan(record);
|
|
60
84
|
return /*#__PURE__*/React.createElement("div", {
|
|
61
85
|
style: {
|
|
62
86
|
display: 'inline-block'
|
|
63
87
|
}
|
|
64
|
-
}, !isNull(get(record, "".concat(_this.id, "_flag"))) ?
|
|
88
|
+
}, !isNull(get(record, "".concat(_this.id, "_flag"))) ? isYouzan ? normalizeYouzanStar(index) && /*#__PURE__*/React.createElement(YouzanStar, {
|
|
89
|
+
compact: true,
|
|
90
|
+
disabled: true,
|
|
91
|
+
value: index
|
|
92
|
+
}) : index !== undefined && /*#__PURE__*/React.createElement("img", {
|
|
65
93
|
src: _this.imgList[Number(index)]
|
|
66
94
|
}) :
|
|
67
95
|
// <i
|
|
@@ -94,7 +122,9 @@ var ERemark = /*#__PURE__*/_createClass(function ERemark(options) {
|
|
|
94
122
|
display: p === null || p === void 0 ? void 0 : p.display,
|
|
95
123
|
required: (_this$componentConfig = (_this$componentConfig2 = _this.componentConfig) === null || _this$componentConfig2 === void 0 ? void 0 : _this$componentConfig2.required) !== null && _this$componentConfig !== void 0 ? _this$componentConfig : false,
|
|
96
124
|
tooltip: (_this$componentConfig3 = _this.componentConfig) !== null && _this$componentConfig3 !== void 0 && _this$componentConfig3.showTooltip ? (_this$componentConfig4 = _this.componentConfig) === null || _this$componentConfig4 === void 0 ? void 0 : _this$componentConfig4.tooltip : '',
|
|
97
|
-
component: /*#__PURE__*/React.createElement(Remark, _this.componentConfig
|
|
125
|
+
component: /*#__PURE__*/React.createElement(Remark, _extends({}, _this.componentConfig, {
|
|
126
|
+
isYouzan: _this.isYouzan()
|
|
127
|
+
}))
|
|
98
128
|
});
|
|
99
129
|
});
|
|
100
130
|
_defineProperty(this, "filterConfig", function (item) {
|
|
@@ -111,7 +141,10 @@ var ERemark = /*#__PURE__*/_createClass(function ERemark(options) {
|
|
|
111
141
|
// 过滤组件名称
|
|
112
142
|
filterComponentType: 'SelectInput',
|
|
113
143
|
props: {
|
|
114
|
-
filterOptions: SEARCH_OPTIONS
|
|
144
|
+
filterOptions: [].concat(_toConsumableArray(SEARCH_OPTIONS), [{
|
|
145
|
+
label: "关键词不包含",
|
|
146
|
+
value: "nincludeLike"
|
|
147
|
+
}])
|
|
115
148
|
},
|
|
116
149
|
filterFn: function filterFn(value) {
|
|
117
150
|
return function (i) {
|
|
@@ -170,6 +203,7 @@ var ERemark = /*#__PURE__*/_createClass(function ERemark(options) {
|
|
|
170
203
|
this.formField = "".concat(options.id, "_remark");
|
|
171
204
|
this.type = options.type;
|
|
172
205
|
this.componentConfig = options.componentConfig;
|
|
206
|
+
this.effects = options.effects;
|
|
173
207
|
this.dataType = 'object';
|
|
174
208
|
this.rules = (_this$componentConfig5 = this.componentConfig) !== null && _this$componentConfig5 !== void 0 && _this$componentConfig5.required ? [{
|
|
175
209
|
validator: function validator(_, value) {
|
|
@@ -177,8 +211,11 @@ var ERemark = /*#__PURE__*/_createClass(function ERemark(options) {
|
|
|
177
211
|
if (!(value !== null && value !== void 0 && value.remark)) {
|
|
178
212
|
return Promise.reject(new Error('请输入备注'));
|
|
179
213
|
}
|
|
180
|
-
if ((_this$componentConfig6 = _this.componentConfig) !== null && _this$componentConfig6 !== void 0 && _this$componentConfig6.isShowFlag
|
|
181
|
-
|
|
214
|
+
if ((_this$componentConfig6 = _this.componentConfig) !== null && _this$componentConfig6 !== void 0 && _this$componentConfig6.isShowFlag) {
|
|
215
|
+
var flag = _this.isYouzan() ? normalizeYouzanStar(value === null || value === void 0 ? void 0 : value.flag) : value === null || value === void 0 ? void 0 : value.flag;
|
|
216
|
+
if (!flag && flag !== 0) {
|
|
217
|
+
return Promise.reject(new Error(_this.isYouzan() ? '请选择星标' : '请选择旗帜'));
|
|
218
|
+
}
|
|
182
219
|
}
|
|
183
220
|
return Promise.resolve();
|
|
184
221
|
}
|
package/dist/esm/constant.js
CHANGED
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, BsPosting, MsgStatus, NodeInput, FlowWorkOrderStatus, WdtGoods, WdtReturn, WdtExchange, CommonInput, PaymentVoucherCode, Label, WdtReissue, GyReissue, AfterSalesOrderId, BsE3Goods, PublicGoods, PublicReissueGoods, PublicExchange, GyGoods, BsE3Reissue, MemberLevel, GyReturn, AsyncSelect, WdtShopSelect, DxdShopSelect, KmVideo, BasicTypeInput, SkxIdInputSelect, SkxGoods, BasicSelectOption, OrderSubForm, FlowOverallStatusSelect, ReturnWarehouse, KmExchange } from "./index";
|
|
2
2
|
import { PickOption } from "./type";
|
|
3
|
-
export declare const factory: (type: string, options: PickOption) =>
|
|
3
|
+
export declare const factory: (type: string, options: PickOption) => CommonMultiStatus | 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 | BsSystemOrder | BsGoods | BsE3Goods | PublicGoods | PublicReissueGoods | PublicExchange | BsE3Reissue | BsExchange | BsReissue | BsReturn | BsLogistics | FlowStatusSelect | FlowMarkSelect | FlowTag | TemplateSelect | WorkOrderId | LogisticsInterception | LogisticsMoreInterception | LogisticsTrajectory | LogisticsMoreTrajectory | PlatForm | ShopInput | Submitter | PrevSubmitter | FlowCreator | Handler | CompletedUser | FlowWorkOrderId | StatusSelect | Calculation | CommonSystemOrder | NodeDeadLine | HandlerDeadLine | NodeStayDuration | BsPosting | NodeInput | FlowWorkOrderStatus | MsgStatus | WdtGoods | WdtReissue | WdtReturn | WdtExchange | WdtShopSelect | DxdShopSelect | KmVideo | CommonInput | PaymentVoucherCode | Label | MemberLevel | AfterSalesOrderId | ReturnWarehouse | GyGoods | KmExchange | GyReissue | GyReturn | AsyncSelect | SkxIdInputSelect | SkxGoods | OrderSubForm | FlowOverallStatusSelect;
|
package/dist/esm/factory.js
CHANGED
|
@@ -142,6 +142,7 @@ export var factory = function factory(type, options) {
|
|
|
142
142
|
case "BS_SYSTEM_ORDER":
|
|
143
143
|
case "KM_SYSTEM_ORDER":
|
|
144
144
|
case "DXD_SYSTEM_ORDER":
|
|
145
|
+
case "TTX_SYSTEM_ORDER":
|
|
145
146
|
case "WLN_SYSTEM_ORDER":
|
|
146
147
|
case "WDT_SYSTEM_ORDER":
|
|
147
148
|
case "BS_E3_SYSTEM_ORDER":
|
|
@@ -162,6 +163,7 @@ export var factory = function factory(type, options) {
|
|
|
162
163
|
case "JY_SEND_GOOD":
|
|
163
164
|
case "JKY_SEND_GOOD":
|
|
164
165
|
case "DXD_SEND_GOOD":
|
|
166
|
+
case "TTX_SEND_GOOD":
|
|
165
167
|
return new JstSendGood(options);
|
|
166
168
|
case "KM_RETURN_WAREHOUSE":
|
|
167
169
|
return new ReturnWarehouse(options);
|
|
@@ -182,6 +184,7 @@ export var factory = function factory(type, options) {
|
|
|
182
184
|
case "JST_AFTERSALE_GOODS":
|
|
183
185
|
case "DXD_GOODS":
|
|
184
186
|
case "DXD_SUPPLIERS":
|
|
187
|
+
case "TTX_GOODS":
|
|
185
188
|
return new PublicGoods(options);
|
|
186
189
|
case "WLN_REISSUE_GOODS":
|
|
187
190
|
case "JST_REISSUE_GOODS":
|
|
@@ -232,6 +235,7 @@ export var factory = function factory(type, options) {
|
|
|
232
235
|
case "SKX_LOGISTICS":
|
|
233
236
|
case "SKX_RETURN_LOGISTICS":
|
|
234
237
|
case "DXD_LOGISTICS":
|
|
238
|
+
case "TTX_LOGISTICS":
|
|
235
239
|
return new BsLogistics(options);
|
|
236
240
|
case "FLOW_WORK_ORDER_ID_INPUT":
|
|
237
241
|
return new FlowWorkOrderId(options);
|
|
@@ -263,6 +267,7 @@ export var factory = function factory(type, options) {
|
|
|
263
267
|
case "JKY_WAREHOUSING_STATUS":
|
|
264
268
|
case "JST_WAREHOUSING_STATUS":
|
|
265
269
|
case "KM_WAREHOUSING_STATUS":
|
|
270
|
+
case "TTX_WAREHOUSING_STATUS":
|
|
266
271
|
return new CommonMultiStatus(options, {
|
|
267
272
|
isWarehousingStatus: true
|
|
268
273
|
});
|
|
@@ -16,6 +16,7 @@ export declare const queryJKYLogisticsCompany: () => Promise<void>;
|
|
|
16
16
|
export declare const queryWLNLogisticsCompany: () => Promise<void>;
|
|
17
17
|
export declare const queryKMLogisticsCompany: () => Promise<void>;
|
|
18
18
|
export declare const queryDXDLogisticsCompany: () => Promise<void>;
|
|
19
|
+
export declare const queryTTXLogisticsCompany: () => Promise<void>;
|
|
19
20
|
export declare const getAlipayBillReceipt: (data: any) => Promise<any>;
|
|
20
21
|
export declare const queryLabel: () => Promise<any>;
|
|
21
22
|
export declare const queryWorkOrderDetail: (data: any) => Promise<any>;
|
package/dist/esm/service/api.js
CHANGED
|
@@ -321,6 +321,12 @@ export var queryDXDLogisticsCompany = function queryDXDLogisticsCompany() {
|
|
|
321
321
|
instance.expressData = data;
|
|
322
322
|
}).catch(function () {});
|
|
323
323
|
};
|
|
324
|
+
export var queryTTXLogisticsCompany = function queryTTXLogisticsCompany() {
|
|
325
|
+
var instance = ExpressData.getInstance("ttx");
|
|
326
|
+
return servers.TTX.getLogisticsDataAsync().then(function (data) {
|
|
327
|
+
instance.expressData = data;
|
|
328
|
+
}).catch(function () {});
|
|
329
|
+
};
|
|
324
330
|
// 获取支付宝电子回单
|
|
325
331
|
export var getAlipayBillReceipt = function getAlipayBillReceipt(data) {
|
|
326
332
|
return request({
|
package/dist/esm/type.d.ts
CHANGED
|
@@ -5,6 +5,7 @@ export declare type ShowHeaderObjType = {
|
|
|
5
5
|
title: string;
|
|
6
6
|
dataIndex: string;
|
|
7
7
|
show?: boolean;
|
|
8
|
+
width?: number;
|
|
8
9
|
};
|
|
9
10
|
export declare type DataType = "string" | "number" | "array" | "dateArray" | "date" | "tradeId";
|
|
10
11
|
export declare type ALignType = "left" | "right" | "center";
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kmkf-fe-packages/services-components",
|
|
3
|
-
"version": "2.10.18-rc.
|
|
3
|
+
"version": "2.10.18-rc.10",
|
|
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.10.18-rc.
|
|
25
|
-
"@kmkf-fe-packages/kmkf-utils": "2.10.18-rc.
|
|
24
|
+
"@kmkf-fe-packages/basic-components": "2.10.18-rc.10",
|
|
25
|
+
"@kmkf-fe-packages/kmkf-utils": "2.10.18-rc.10",
|
|
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": "13f888ad251c0b228a6601a84da7e41d09cc0754",
|
|
45
45
|
"gitHooks": {
|
|
46
46
|
"pre-commit": "lint-staged"
|
|
47
47
|
}
|