@kmkf-fe-packages/services-components 2.3.3 → 2.3.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/esm/commonComponents/GlobalContext/hook/useGetHasErpData.d.ts +1 -1
- package/dist/esm/commonComponents/GlobalContext/hook/useGetHasErpData.js +3 -2
- package/dist/esm/commonComponents/GlobalContext/orderQuery/useGetErpAddressData.js +4 -2
- package/dist/esm/commonComponents/GlobalContext/orderQuery/useGetErpLogisticsCompany.js +13 -12
- package/dist/esm/commonComponents/GlobalContext/orderQuery/useGetErpSendData.js +10 -9
- package/dist/esm/commonComponents/QueryLogisticsTrack/index.d.ts +5 -3
- package/dist/esm/commonComponents/QueryLogisticsTrack/index.js +23 -19
- package/dist/esm/components/BS/BsLogistics/index.js +9 -0
- package/dist/esm/components/BS/BsSystemOrder/index.js +2 -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 +3 -0
- package/dist/esm/components/Common/constants/columnsBaseInfoMap.js +4 -2
- package/dist/esm/components/Common/index.d.ts +1 -1
- package/dist/esm/components/Common/index.js +6 -3
- package/dist/esm/components/CommonHeaderGood/index.js +397 -0
- package/dist/esm/components/CommonMultiStatus/index.js +73 -36
- 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.js +4 -0
- package/dist/esm/components/Public/ReissueGoods/index.js +18 -0
- package/dist/esm/factory.d.ts +1 -1
- package/dist/esm/factory.js +6 -0
- package/dist/esm/service/api.d.ts +1 -0
- package/dist/esm/service/api.js +7 -0
- package/package.json +4 -4
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
declare type HasErpDataKeyType = "hasWln" | "hasWdt" | "hasBs" | "hasE3" | "hasJst" | "hasGy" | "hasJy";
|
|
1
|
+
declare type HasErpDataKeyType = "hasWln" | "hasWdt" | "hasBs" | "hasE3" | "hasJst" | "hasGy" | "hasJy" | "hasJky";
|
|
2
2
|
declare function useGetHasErpData(reduxData: any): Record<HasErpDataKeyType, boolean>;
|
|
3
3
|
export default useGetHasErpData;
|
|
@@ -6,7 +6,7 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
|
|
|
6
6
|
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
7
7
|
import { useEffect, useMemo, useState } from "react";
|
|
8
8
|
var getTemplate = function getTemplate(companyUserConfig) {
|
|
9
|
-
var _companyUserConfig$pl, _companyUserConfig$pl2, _companyUserConfig$pl3, _companyUserConfig$pl4, _companyUserConfig$pl5, _companyUserConfig$pl6, _companyUserConfig$pl7, _companyUserConfig$pl8, _companyUserConfig$pl9, _companyUserConfig$pl10, _companyUserConfig$pl11, _companyUserConfig$pl12, _companyUserConfig$pl13, _companyUserConfig$pl14, _companyUserConfig$pl15, _companyUserConfig$pl16, _companyUserConfig$pl17, _companyUserConfig$pl18, _companyUserConfig$pl19, _companyUserConfig$pl20, _companyUserConfig$pl21;
|
|
9
|
+
var _companyUserConfig$pl, _companyUserConfig$pl2, _companyUserConfig$pl3, _companyUserConfig$pl4, _companyUserConfig$pl5, _companyUserConfig$pl6, _companyUserConfig$pl7, _companyUserConfig$pl8, _companyUserConfig$pl9, _companyUserConfig$pl10, _companyUserConfig$pl11, _companyUserConfig$pl12, _companyUserConfig$pl13, _companyUserConfig$pl14, _companyUserConfig$pl15, _companyUserConfig$pl16, _companyUserConfig$pl17, _companyUserConfig$pl18, _companyUserConfig$pl19, _companyUserConfig$pl20, _companyUserConfig$pl21, _companyUserConfig$pl22, _companyUserConfig$pl23, _companyUserConfig$pl24;
|
|
10
10
|
return JSON.stringify({
|
|
11
11
|
hasWln: (_companyUserConfig$pl = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : (_companyUserConfig$pl2 = companyUserConfig.plugins) === null || _companyUserConfig$pl2 === void 0 ? void 0 : (_companyUserConfig$pl3 = _companyUserConfig$pl2.wln) === null || _companyUserConfig$pl3 === void 0 ? void 0 : _companyUserConfig$pl3.show) !== null && _companyUserConfig$pl !== void 0 ? _companyUserConfig$pl : false,
|
|
12
12
|
hasWdt: (_companyUserConfig$pl4 = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : (_companyUserConfig$pl5 = companyUserConfig.plugins) === null || _companyUserConfig$pl5 === void 0 ? void 0 : (_companyUserConfig$pl6 = _companyUserConfig$pl5.wdt) === null || _companyUserConfig$pl6 === void 0 ? void 0 : _companyUserConfig$pl6.show) !== null && _companyUserConfig$pl4 !== void 0 ? _companyUserConfig$pl4 : false,
|
|
@@ -14,7 +14,8 @@ var getTemplate = function getTemplate(companyUserConfig) {
|
|
|
14
14
|
hasE3: (_companyUserConfig$pl10 = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : (_companyUserConfig$pl11 = companyUserConfig.plugins) === null || _companyUserConfig$pl11 === void 0 ? void 0 : (_companyUserConfig$pl12 = _companyUserConfig$pl11.bse3) === null || _companyUserConfig$pl12 === void 0 ? void 0 : _companyUserConfig$pl12.show) !== null && _companyUserConfig$pl10 !== void 0 ? _companyUserConfig$pl10 : false,
|
|
15
15
|
hasJst: (_companyUserConfig$pl13 = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : (_companyUserConfig$pl14 = companyUserConfig.plugins) === null || _companyUserConfig$pl14 === void 0 ? void 0 : (_companyUserConfig$pl15 = _companyUserConfig$pl14.jst) === null || _companyUserConfig$pl15 === void 0 ? void 0 : _companyUserConfig$pl15.show) !== null && _companyUserConfig$pl13 !== void 0 ? _companyUserConfig$pl13 : false,
|
|
16
16
|
hasGy: (_companyUserConfig$pl16 = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : (_companyUserConfig$pl17 = companyUserConfig.plugins) === null || _companyUserConfig$pl17 === void 0 ? void 0 : (_companyUserConfig$pl18 = _companyUserConfig$pl17.gy) === null || _companyUserConfig$pl18 === void 0 ? void 0 : _companyUserConfig$pl18.show) !== null && _companyUserConfig$pl16 !== void 0 ? _companyUserConfig$pl16 : false,
|
|
17
|
-
hasJy: (_companyUserConfig$pl19 = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : (_companyUserConfig$pl20 = companyUserConfig.plugins) === null || _companyUserConfig$pl20 === void 0 ? void 0 : (_companyUserConfig$pl21 = _companyUserConfig$pl20.juYi) === null || _companyUserConfig$pl21 === void 0 ? void 0 : _companyUserConfig$pl21.show) !== null && _companyUserConfig$pl19 !== void 0 ? _companyUserConfig$pl19 : false
|
|
17
|
+
hasJy: (_companyUserConfig$pl19 = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : (_companyUserConfig$pl20 = companyUserConfig.plugins) === null || _companyUserConfig$pl20 === void 0 ? void 0 : (_companyUserConfig$pl21 = _companyUserConfig$pl20.juYi) === null || _companyUserConfig$pl21 === void 0 ? void 0 : _companyUserConfig$pl21.show) !== null && _companyUserConfig$pl19 !== void 0 ? _companyUserConfig$pl19 : false,
|
|
18
|
+
hasJky: (_companyUserConfig$pl22 = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : (_companyUserConfig$pl23 = companyUserConfig.plugins) === null || _companyUserConfig$pl23 === void 0 ? void 0 : (_companyUserConfig$pl24 = _companyUserConfig$pl23.jky) === null || _companyUserConfig$pl24 === void 0 ? void 0 : _companyUserConfig$pl24.show) !== null && _companyUserConfig$pl22 !== void 0 ? _companyUserConfig$pl22 : false
|
|
18
19
|
});
|
|
19
20
|
};
|
|
20
21
|
function useGetHasErpData(reduxData) {
|
|
@@ -22,17 +22,19 @@ function useGetErpAddressData(reduxData, notJudgedErp) {
|
|
|
22
22
|
}, [hasErpData, notJudgedErp]);
|
|
23
23
|
var asyncQueryData = /*#__PURE__*/function () {
|
|
24
24
|
var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(hasErpData, notJudgedErp, isReload) {
|
|
25
|
-
var hasBs, hasWdt, hasGy, hasJst, promises;
|
|
25
|
+
var hasBs, hasWdt, hasGy, hasJst, hasJky, promises;
|
|
26
26
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
27
27
|
while (1) switch (_context.prev = _context.next) {
|
|
28
28
|
case 0:
|
|
29
29
|
if (!isReload) {
|
|
30
30
|
setGlobalState("loading");
|
|
31
31
|
}
|
|
32
|
-
hasBs = hasErpData.hasBs, hasWdt = hasErpData.hasWdt, hasGy = hasErpData.hasGy, hasJst = hasErpData.hasJst;
|
|
32
|
+
hasBs = hasErpData.hasBs, hasWdt = hasErpData.hasWdt, hasGy = hasErpData.hasGy, hasJst = hasErpData.hasJst, hasJky = hasErpData.hasJky;
|
|
33
33
|
promises = [];
|
|
34
34
|
if (hasBs || notJudgedErp) promises.push(servers.queryBsAddressData);
|
|
35
35
|
if (hasWdt || notJudgedErp) promises.push(servers.queryWdtAddressData);
|
|
36
|
+
// JKY用的系统的地址,暂时不需要查询
|
|
37
|
+
// if (hasJky || notJudgedErp) promises.push(servers.queryJkyAddressData);
|
|
36
38
|
if (hasGy || notJudgedErp) promises.push(servers.queryGyAddressData);
|
|
37
39
|
if (hasJst || notJudgedErp) promises.push(servers.queryJstAddressData);
|
|
38
40
|
_context.prev = 7;
|
|
@@ -10,7 +10,7 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
|
|
|
10
10
|
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
11
11
|
import { useEffect, useState } from "react";
|
|
12
12
|
import useGetHasErpData from "../hook/useGetHasErpData";
|
|
13
|
-
import { queryWdtLogisticsCompany, queryBsE3LogisticsCompany, queryJSTLogisticsCompany, queryWLNLogisticsCompany, queryGYLogisticsCompany, queryJYLogisticsCompany } from "../../../service/api";
|
|
13
|
+
import { queryWdtLogisticsCompany, queryBsE3LogisticsCompany, queryJSTLogisticsCompany, queryWLNLogisticsCompany, queryGYLogisticsCompany, queryJYLogisticsCompany, queryJKYLogisticsCompany } from "../../../service/api";
|
|
14
14
|
function useGetErpLogisticsCompany(reduxData, notJudgedErp) {
|
|
15
15
|
var _useState = useState("loading"),
|
|
16
16
|
_useState2 = _slicedToArray(_useState, 2),
|
|
@@ -22,14 +22,14 @@ function useGetErpLogisticsCompany(reduxData, notJudgedErp) {
|
|
|
22
22
|
}, [hasErpData, notJudgedErp]);
|
|
23
23
|
var asyncQueryData = /*#__PURE__*/function () {
|
|
24
24
|
var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(hasErpData, notJudgedErp, isReload) {
|
|
25
|
-
var hasWdt, hasE3, hasJst, hasWln, hasGy, hasJy, promises;
|
|
25
|
+
var hasWdt, hasE3, hasJst, hasWln, hasGy, hasJy, hasJky, promises;
|
|
26
26
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
27
27
|
while (1) switch (_context.prev = _context.next) {
|
|
28
28
|
case 0:
|
|
29
29
|
if (!isReload) {
|
|
30
30
|
setGlobalState("loading");
|
|
31
31
|
}
|
|
32
|
-
hasWdt = hasErpData.hasWdt, hasE3 = hasErpData.hasE3, hasJst = hasErpData.hasJst, hasWln = hasErpData.hasWln, hasGy = hasErpData.hasGy, hasJy = hasErpData.hasJy;
|
|
32
|
+
hasWdt = hasErpData.hasWdt, hasE3 = hasErpData.hasE3, hasJst = hasErpData.hasJst, hasWln = hasErpData.hasWln, hasGy = hasErpData.hasGy, hasJy = hasErpData.hasJy, hasJky = hasErpData.hasJky;
|
|
33
33
|
promises = [];
|
|
34
34
|
if (hasWdt || notJudgedErp) promises.push(queryWdtLogisticsCompany);
|
|
35
35
|
if (hasE3 || notJudgedErp) promises.push(queryBsE3LogisticsCompany);
|
|
@@ -37,24 +37,25 @@ function useGetErpLogisticsCompany(reduxData, notJudgedErp) {
|
|
|
37
37
|
if (hasWln || notJudgedErp) promises.push(queryWLNLogisticsCompany);
|
|
38
38
|
if (hasGy || notJudgedErp) promises.push(queryGYLogisticsCompany);
|
|
39
39
|
if (hasJy || notJudgedErp) promises.push(queryJYLogisticsCompany);
|
|
40
|
-
|
|
41
|
-
_context.
|
|
40
|
+
if (hasJky || notJudgedErp) promises.push(queryJKYLogisticsCompany);
|
|
41
|
+
_context.prev = 10;
|
|
42
|
+
_context.next = 13;
|
|
42
43
|
return Promise.all(promises.map(function (promise) {
|
|
43
44
|
return promise();
|
|
44
45
|
}));
|
|
45
|
-
case
|
|
46
|
+
case 13:
|
|
46
47
|
setGlobalState("success");
|
|
47
|
-
_context.next =
|
|
48
|
+
_context.next = 19;
|
|
48
49
|
break;
|
|
49
|
-
case
|
|
50
|
-
_context.prev =
|
|
51
|
-
_context.t0 = _context["catch"](
|
|
50
|
+
case 16:
|
|
51
|
+
_context.prev = 16;
|
|
52
|
+
_context.t0 = _context["catch"](10);
|
|
52
53
|
setGlobalState("failed");
|
|
53
|
-
case
|
|
54
|
+
case 19:
|
|
54
55
|
case "end":
|
|
55
56
|
return _context.stop();
|
|
56
57
|
}
|
|
57
|
-
}, _callee, null, [[
|
|
58
|
+
}, _callee, null, [[10, 16]]);
|
|
58
59
|
}));
|
|
59
60
|
return function asyncQueryData(_x2, _x3, _x4) {
|
|
60
61
|
return _ref.apply(this, arguments);
|
|
@@ -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, promises;
|
|
26
|
+
var hasWdt, hasGy, hasJst, hasJy, hasJky, promises;
|
|
27
27
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
28
28
|
while (1) switch (_context.prev = _context.next) {
|
|
29
29
|
case 0:
|
|
@@ -31,29 +31,30 @@ 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;
|
|
34
|
+
hasWdt = hasErpData.hasWdt, hasGy = hasErpData.hasGy, hasJst = hasErpData.hasJst, hasJy = hasErpData.hasJy, hasJky = hasErpData.hasJky;
|
|
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
|
-
|
|
40
|
+
if (hasJky || notJudgedErp) promises.push(SendDataCenter.getInstance("jky").fetchData);
|
|
41
|
+
_context.next = 11;
|
|
41
42
|
return Promise.all(promises.map(function (promise) {
|
|
42
43
|
return promise();
|
|
43
44
|
}));
|
|
44
|
-
case
|
|
45
|
+
case 11:
|
|
45
46
|
setGlobalState("success");
|
|
46
|
-
_context.next =
|
|
47
|
+
_context.next = 17;
|
|
47
48
|
break;
|
|
48
|
-
case
|
|
49
|
-
_context.prev =
|
|
49
|
+
case 14:
|
|
50
|
+
_context.prev = 14;
|
|
50
51
|
_context.t0 = _context["catch"](1);
|
|
51
52
|
setGlobalState("failed");
|
|
52
|
-
case
|
|
53
|
+
case 17:
|
|
53
54
|
case "end":
|
|
54
55
|
return _context.stop();
|
|
55
56
|
}
|
|
56
|
-
}, _callee, null, [[1,
|
|
57
|
+
}, _callee, null, [[1, 14]]);
|
|
57
58
|
}));
|
|
58
59
|
return function asyncQueryData(_x2, _x3, _x4) {
|
|
59
60
|
return _ref.apply(this, arguments);
|
|
@@ -1,9 +1,11 @@
|
|
|
1
|
-
import React from
|
|
2
|
-
declare const QueryLogisticsTrack: ({ title, modelWidth, interceptCompany, interceptCode, interceptSenderMobile, }: {
|
|
1
|
+
import React from "react";
|
|
2
|
+
declare const QueryLogisticsTrack: ({ title, modelWidth, interceptCompany, interceptCode, interceptSenderMobile, interceptCompanyName, shopUk, }: {
|
|
3
3
|
title?: string | undefined;
|
|
4
4
|
modelWidth?: string | number | undefined;
|
|
5
|
-
interceptCompany
|
|
5
|
+
interceptCompany?: string | undefined;
|
|
6
6
|
interceptCode: string;
|
|
7
7
|
interceptSenderMobile?: string | number | undefined;
|
|
8
|
+
interceptCompanyName?: string | undefined;
|
|
9
|
+
shopUk?: string | undefined;
|
|
8
10
|
}) => React.JSX.Element;
|
|
9
11
|
export default QueryLogisticsTrack;
|
|
@@ -8,19 +8,21 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
|
|
|
8
8
|
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; }
|
|
9
9
|
function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
|
|
10
10
|
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
11
|
-
import React, { useState } from
|
|
12
|
-
import { Modal, Timeline, message } from
|
|
13
|
-
import { request } from
|
|
11
|
+
import React, { useState } from "react";
|
|
12
|
+
import { Modal, Timeline, message } from "antd";
|
|
13
|
+
import { request } from "@kmkf-fe-packages/kmkf-utils";
|
|
14
14
|
import CopyText from "../CopyText";
|
|
15
15
|
var QueryLogisticsTrack = function QueryLogisticsTrack(_ref) {
|
|
16
16
|
var _ref$title = _ref.title,
|
|
17
|
-
title = _ref$title === void 0 ?
|
|
17
|
+
title = _ref$title === void 0 ? "查轨迹" : _ref$title,
|
|
18
18
|
_ref$modelWidth = _ref.modelWidth,
|
|
19
19
|
modelWidth = _ref$modelWidth === void 0 ? 500 : _ref$modelWidth,
|
|
20
20
|
interceptCompany = _ref.interceptCompany,
|
|
21
21
|
interceptCode = _ref.interceptCode,
|
|
22
|
-
interceptSenderMobile = _ref.interceptSenderMobile
|
|
23
|
-
|
|
22
|
+
interceptSenderMobile = _ref.interceptSenderMobile,
|
|
23
|
+
interceptCompanyName = _ref.interceptCompanyName,
|
|
24
|
+
shopUk = _ref.shopUk;
|
|
25
|
+
var _useState = useState(""),
|
|
24
26
|
_useState2 = _slicedToArray(_useState, 2),
|
|
25
27
|
inputVal = _useState2[0],
|
|
26
28
|
setInputVal = _useState2[1];
|
|
@@ -36,9 +38,9 @@ var QueryLogisticsTrack = function QueryLogisticsTrack(_ref) {
|
|
|
36
38
|
var list = _ref2.list;
|
|
37
39
|
return /*#__PURE__*/React.createElement("div", {
|
|
38
40
|
style: {
|
|
39
|
-
maxHeight:
|
|
40
|
-
padding:
|
|
41
|
-
overflowY:
|
|
41
|
+
maxHeight: "500px",
|
|
42
|
+
padding: "8px 0",
|
|
43
|
+
overflowY: "auto"
|
|
42
44
|
}
|
|
43
45
|
}, /*#__PURE__*/React.createElement(Timeline, null, list.map(function (item, index) {
|
|
44
46
|
return /*#__PURE__*/React.createElement(Timeline.Item, {
|
|
@@ -51,11 +53,11 @@ var QueryLogisticsTrack = function QueryLogisticsTrack(_ref) {
|
|
|
51
53
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
52
54
|
while (1) switch (_context.prev = _context.next) {
|
|
53
55
|
case 0:
|
|
54
|
-
if (!(!interceptCode || !interceptCompany)) {
|
|
56
|
+
if (!(!interceptCode || !interceptCompany && !interceptCompanyName)) {
|
|
55
57
|
_context.next = 2;
|
|
56
58
|
break;
|
|
57
59
|
}
|
|
58
|
-
return _context.abrupt("return", message.error(
|
|
60
|
+
return _context.abrupt("return", message.error("缺少物流公司或物流单号"));
|
|
59
61
|
case 2:
|
|
60
62
|
logisticsTraceSearch();
|
|
61
63
|
//如果是顺丰且没有手机号 要输入手机号
|
|
@@ -90,12 +92,14 @@ var QueryLogisticsTrack = function QueryLogisticsTrack(_ref) {
|
|
|
90
92
|
var logisticsTraceSearch = function logisticsTraceSearch(mobile) {
|
|
91
93
|
try {
|
|
92
94
|
request({
|
|
93
|
-
url:
|
|
94
|
-
method:
|
|
95
|
+
url: "/qy/logistics/logisticsTraceSearch",
|
|
96
|
+
method: "post",
|
|
95
97
|
data: {
|
|
96
98
|
mailNo: interceptCode,
|
|
97
99
|
cpCode: interceptCompany,
|
|
98
|
-
mobile: interceptSenderMobile || mobile
|
|
100
|
+
mobile: interceptSenderMobile || mobile,
|
|
101
|
+
cpName: interceptCompanyName,
|
|
102
|
+
shopUk: shopUk
|
|
99
103
|
},
|
|
100
104
|
handleError: function handleError(msg) {
|
|
101
105
|
msg && message.error(msg);
|
|
@@ -118,16 +122,16 @@ var QueryLogisticsTrack = function QueryLogisticsTrack(_ref) {
|
|
|
118
122
|
};
|
|
119
123
|
return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
|
|
120
124
|
style: {
|
|
121
|
-
margin:
|
|
122
|
-
color:
|
|
123
|
-
cursor:
|
|
125
|
+
margin: "0 8px",
|
|
126
|
+
color: "#1890ff",
|
|
127
|
+
cursor: "pointer"
|
|
124
128
|
}
|
|
125
129
|
}, /*#__PURE__*/React.createElement("span", {
|
|
126
130
|
onClick: handleQueryLogistics
|
|
127
|
-
}, title ===
|
|
131
|
+
}, title === "查轨迹" ? title : /*#__PURE__*/React.createElement(CopyText, {
|
|
128
132
|
text: title,
|
|
129
133
|
style: {
|
|
130
|
-
color:
|
|
134
|
+
color: "#1890ff"
|
|
131
135
|
}
|
|
132
136
|
}))), /*#__PURE__*/React.createElement(Modal, {
|
|
133
137
|
width: modelWidth,
|
|
@@ -110,6 +110,15 @@ var typeMap = {
|
|
|
110
110
|
platformType: "jy",
|
|
111
111
|
companyDataType: "string",
|
|
112
112
|
companyCodeType: "arrayObject"
|
|
113
|
+
},
|
|
114
|
+
JKY_LOGISTICS: {
|
|
115
|
+
key: "jkyLogisticsList",
|
|
116
|
+
name: "吉客云",
|
|
117
|
+
company: "jkyLogisticsCompany",
|
|
118
|
+
code: "jkyLogisticsCode",
|
|
119
|
+
platformType: "jky",
|
|
120
|
+
companyDataType: "string",
|
|
121
|
+
companyCodeType: "arrayObject"
|
|
113
122
|
}
|
|
114
123
|
};
|
|
115
124
|
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, JY_SYSTEM_ORDER_CONFIG, WDT_RETURN_BILL_NO_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, JKY_SYSTEM_ORDER_CONFIG, WDT_RETURN_BILL_NO_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";
|
|
@@ -26,6 +26,7 @@ var typeMap = {
|
|
|
26
26
|
GY_SYSTEM_ORDER: GY_SYSTEM_ORDER_CONFIG,
|
|
27
27
|
JST_SYSTEM_ORDER: JST_SYSTEM_ORDER_CONFIG,
|
|
28
28
|
JY_SYSTEM_ORDER: JY_SYSTEM_ORDER_CONFIG,
|
|
29
|
+
JKY_SYSTEM_ORDER: JKY_SYSTEM_ORDER_CONFIG,
|
|
29
30
|
WDT_RETURN_BILL_NO: WDT_RETURN_BILL_NO_CONFIG
|
|
30
31
|
};
|
|
31
32
|
var BsSystemOrder = /*#__PURE__*/_createClass(function BsSystemOrder(options) {
|
|
@@ -122,7 +123,6 @@ var BsSystemOrder = /*#__PURE__*/_createClass(function BsSystemOrder(options) {
|
|
|
122
123
|
columns: ((_typeMap$options$type = typeMap[options.type]) === null || _typeMap$options$type === void 0 ? void 0 : _typeMap$options$type.columns) || [],
|
|
123
124
|
showHeader: (options === null || options === void 0 ? void 0 : (_options$componentCon = options.componentConfig) === null || _options$componentCon === void 0 ? void 0 : _options$componentCon.showHeader) || []
|
|
124
125
|
})) === null || _getSystemShowHead === void 0 ? void 0 : _getSystemShowHead.map(function (column) {
|
|
125
|
-
console.log("column", column, "".concat(options.id, "_").concat(typeMap[options.type].key, "_").concat(column.dataIndex));
|
|
126
126
|
return new BsHeaderChild(_objectSpread(_objectSpread({}, options), {}, {
|
|
127
127
|
transformValue: column.render,
|
|
128
128
|
renderExport: column.renderExport,
|
|
@@ -26,7 +26,8 @@ var componentType = {
|
|
|
26
26
|
JST_REISSUE_GOODS: "jstReissueType",
|
|
27
27
|
JST_RETURN_GOODS: "jstReturnType",
|
|
28
28
|
KM_REISSUE_GOODS: "kmReissueType",
|
|
29
|
-
JY_REISSUE_GOODS: "jyReissueType"
|
|
29
|
+
JY_REISSUE_GOODS: "jyReissueType",
|
|
30
|
+
JKY_REISSUE_GOODS: "jkyReissueType"
|
|
30
31
|
};
|
|
31
32
|
var BsMemo = /*#__PURE__*/_createClass(function BsMemo(options) {
|
|
32
33
|
var _this = this;
|
|
@@ -27,7 +27,8 @@ var componentType = {
|
|
|
27
27
|
JST_REISSUE_GOODS: "jstReissueType",
|
|
28
28
|
JST_RETURN_GOODS: "jstReturnType",
|
|
29
29
|
KM_REISSUE_GOODS: "kmReissueType",
|
|
30
|
-
JY_REISSUE_GOODS: "jyReissueType"
|
|
30
|
+
JY_REISSUE_GOODS: "jyReissueType",
|
|
31
|
+
JKY_REISSUE_GOODS: "jkyReissueType"
|
|
31
32
|
};
|
|
32
33
|
var BsType = /*#__PURE__*/_createClass(function BsType(options) {
|
|
33
34
|
var _this = this;
|
|
@@ -22,7 +22,8 @@ var componentType = {
|
|
|
22
22
|
JST_REISSUE_GOODS: "jstSystemOrderNo",
|
|
23
23
|
JST_RETURN_GOODS: "jstSystemOrderNo",
|
|
24
24
|
KM_REISSUE_GOODS: "kmSystemOrderNo",
|
|
25
|
-
JY_REISSUE_GOODS: "jySystemOrderNo"
|
|
25
|
+
JY_REISSUE_GOODS: "jySystemOrderNo",
|
|
26
|
+
JKY_REISSUE_GOODS: "jkySystemOrderNo"
|
|
26
27
|
};
|
|
27
28
|
var SystemOrderNo = /*#__PURE__*/_createClass(function SystemOrderNo(options) {
|
|
28
29
|
var _this = this;
|
|
@@ -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 } from "@kmkf-fe-packages/basic-components";
|
|
10
|
+
import { getJstColumns, getWlnColumns, getGyColumns, getWdtColumns, getKmColumns, getJyColumns, getSkxColumns, getJkyColumns } 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({}, system()), bs({
|
|
16
|
+
return _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,
|
|
@@ -28,6 +28,8 @@ export var getColumnsMap = function getColumnsMap(args) {
|
|
|
28
28
|
disabled: true
|
|
29
29
|
})), getJyColumns({
|
|
30
30
|
disabled: true
|
|
31
|
+
})), getJkyColumns({
|
|
32
|
+
disabled: true
|
|
31
33
|
})), getSkxColumns({})), {}, {
|
|
32
34
|
default: defaultColumns({
|
|
33
35
|
text: text
|
|
@@ -25,7 +25,7 @@ export declare const ShowTotalImage: ({ total, allImage, type, showHeader, }: {
|
|
|
25
25
|
export declare const GoodImage: ({ list, type, showHeader }: any) => React.JSX.Element | null;
|
|
26
26
|
export declare const JstGoodImage: ({ list, type, platformType, logisticsCompanyFormType, }: any) => any;
|
|
27
27
|
export declare const BsExpressRender: ({ list, showField, platformType, logisticsCompanyFormType, }: any) => any;
|
|
28
|
-
export declare const CommonOrderContent: ({ list, valueKey: initValueKey, failValue, options, isShowPopover, }: any) => any;
|
|
28
|
+
export declare const CommonOrderContent: ({ list, valueKey: initValueKey, failValue, options, isShowPopover, idKey, }: any) => any;
|
|
29
29
|
export declare const BsGoodImage: ({ item, index }: {
|
|
30
30
|
item: any;
|
|
31
31
|
index: number;
|
|
@@ -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, JY_SYSTEM_ORDER_CONFIG, WDT_RETURN_BILL_NO_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, JKY_SYSTEM_ORDER_CONFIG, WDT_RETURN_BILL_NO_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
|
import { ApaasImage } from "@kmkf-fe-packages/basic-components";
|
|
@@ -333,7 +333,8 @@ export var CommonOrderContent = function CommonOrderContent(_ref8) {
|
|
|
333
333
|
_ref8$options = _ref8.options,
|
|
334
334
|
options = _ref8$options === void 0 ? [] : _ref8$options,
|
|
335
335
|
_ref8$isShowPopover = _ref8.isShowPopover,
|
|
336
|
-
isShowPopover = _ref8$isShowPopover === void 0 ? true : _ref8$isShowPopover
|
|
336
|
+
isShowPopover = _ref8$isShowPopover === void 0 ? true : _ref8$isShowPopover,
|
|
337
|
+
idKey = _ref8.idKey;
|
|
337
338
|
var getContentData = function getContentData(item, index) {
|
|
338
339
|
if (item.platformId) return {
|
|
339
340
|
text: "平台售后单号",
|
|
@@ -345,7 +346,7 @@ export var CommonOrderContent = function CommonOrderContent(_ref8) {
|
|
|
345
346
|
};
|
|
346
347
|
return {
|
|
347
348
|
text: "\u7CFB\u7EDF\u8BA2\u5355\u53F7".concat(index + 1),
|
|
348
|
-
id: item.systemOrderId || item.systemOrderNo
|
|
349
|
+
id: item.systemOrderId || item.systemOrderNo || (item === null || item === void 0 ? void 0 : item[idKey])
|
|
349
350
|
};
|
|
350
351
|
};
|
|
351
352
|
var orderContent = function orderContent(item, index) {
|
|
@@ -782,6 +783,7 @@ export var BsSystemOrderTable = function BsSystemOrderTable(_ref14) {
|
|
|
782
783
|
GY_SYSTEM_ORDER: GY_SYSTEM_ORDER_CONFIG.columns,
|
|
783
784
|
JST_SYSTEM_ORDER: JST_SYSTEM_ORDER_CONFIG.columns,
|
|
784
785
|
JY_SYSTEM_ORDER: JY_SYSTEM_ORDER_CONFIG.columns,
|
|
786
|
+
JKY_SYSTEM_ORDER: JKY_SYSTEM_ORDER_CONFIG.columns,
|
|
785
787
|
WDT_RETURN_BILL_NO: WDT_RETURN_BILL_NO_CONFIG.columns
|
|
786
788
|
};
|
|
787
789
|
var rowKeyMap = {
|
|
@@ -793,6 +795,7 @@ export var BsSystemOrderTable = function BsSystemOrderTable(_ref14) {
|
|
|
793
795
|
GY_SYSTEM_ORDER: "billNo",
|
|
794
796
|
JST_SYSTEM_ORDER: "oId",
|
|
795
797
|
JY_SYSTEM_ORDER: "tradeNo",
|
|
798
|
+
JKY_SYSTEM_ORDER: "tradeNo",
|
|
796
799
|
WDT_RETURN_BILL_NO: "refundNo"
|
|
797
800
|
};
|
|
798
801
|
var rowSelection = {
|
|
@@ -2082,6 +2082,403 @@ var GoodHeaderMap = {
|
|
|
2082
2082
|
width: 200
|
|
2083
2083
|
}
|
|
2084
2084
|
}
|
|
2085
|
+
},
|
|
2086
|
+
JKY_GOODS: {
|
|
2087
|
+
headerMap: {
|
|
2088
|
+
goodsNo: {
|
|
2089
|
+
component: BsHeaderChild,
|
|
2090
|
+
name: "货品编号",
|
|
2091
|
+
key: "goodsNo",
|
|
2092
|
+
width: 150
|
|
2093
|
+
},
|
|
2094
|
+
goodsName: {
|
|
2095
|
+
component: BsHeaderChild,
|
|
2096
|
+
name: "货品名称",
|
|
2097
|
+
key: "goodsName",
|
|
2098
|
+
width: 150
|
|
2099
|
+
},
|
|
2100
|
+
goodsId: {
|
|
2101
|
+
component: BsHeaderChild,
|
|
2102
|
+
name: "货品ID",
|
|
2103
|
+
key: "goodsId",
|
|
2104
|
+
width: 150
|
|
2105
|
+
},
|
|
2106
|
+
barcode: {
|
|
2107
|
+
component: BsHeaderChild,
|
|
2108
|
+
name: "货品条码",
|
|
2109
|
+
key: "barcode",
|
|
2110
|
+
width: 150
|
|
2111
|
+
},
|
|
2112
|
+
specName: {
|
|
2113
|
+
component: BsHeaderChild,
|
|
2114
|
+
name: "规格名称",
|
|
2115
|
+
key: "specName",
|
|
2116
|
+
width: 150
|
|
2117
|
+
},
|
|
2118
|
+
specId: {
|
|
2119
|
+
component: BsHeaderChild,
|
|
2120
|
+
name: "规格ID",
|
|
2121
|
+
key: "specId",
|
|
2122
|
+
width: 150
|
|
2123
|
+
},
|
|
2124
|
+
skuImgUrl: {
|
|
2125
|
+
component: BsHeaderPic,
|
|
2126
|
+
name: "规格图片",
|
|
2127
|
+
key: "skuImgUrl",
|
|
2128
|
+
width: 150
|
|
2129
|
+
},
|
|
2130
|
+
sellCount: {
|
|
2131
|
+
component: BsHeaderChild,
|
|
2132
|
+
name: "数量",
|
|
2133
|
+
key: "sellCount",
|
|
2134
|
+
width: 100
|
|
2135
|
+
},
|
|
2136
|
+
actualSendCount: {
|
|
2137
|
+
component: BsHeaderChild,
|
|
2138
|
+
name: "实发数量",
|
|
2139
|
+
key: "actualSendCount",
|
|
2140
|
+
width: 150
|
|
2141
|
+
},
|
|
2142
|
+
sellPrice: {
|
|
2143
|
+
component: BsHeaderChild,
|
|
2144
|
+
name: "单价",
|
|
2145
|
+
key: "sellPrice",
|
|
2146
|
+
width: 150
|
|
2147
|
+
},
|
|
2148
|
+
sellTotal: {
|
|
2149
|
+
component: BsHeaderChild,
|
|
2150
|
+
name: "总金额",
|
|
2151
|
+
key: "sellTotal",
|
|
2152
|
+
width: 150
|
|
2153
|
+
},
|
|
2154
|
+
discountTotal: {
|
|
2155
|
+
component: BsHeaderChild,
|
|
2156
|
+
name: "抵扣金额",
|
|
2157
|
+
key: "discountTotal",
|
|
2158
|
+
width: 150
|
|
2159
|
+
},
|
|
2160
|
+
shareFavourableFee: {
|
|
2161
|
+
component: BsHeaderChild,
|
|
2162
|
+
name: "分摊金额",
|
|
2163
|
+
key: "shareFavourableFee",
|
|
2164
|
+
width: 150
|
|
2165
|
+
},
|
|
2166
|
+
shareFavourableAfterFee: {
|
|
2167
|
+
component: BsHeaderChild,
|
|
2168
|
+
name: "分摊后金额",
|
|
2169
|
+
key: "shareFavourableAfterFee",
|
|
2170
|
+
width: 150
|
|
2171
|
+
},
|
|
2172
|
+
customerPrice: {
|
|
2173
|
+
component: BsHeaderChild,
|
|
2174
|
+
name: "终端销售单价",
|
|
2175
|
+
key: "customerPrice",
|
|
2176
|
+
width: 150
|
|
2177
|
+
},
|
|
2178
|
+
customerTotal: {
|
|
2179
|
+
component: BsHeaderChild,
|
|
2180
|
+
name: "终端销售金额",
|
|
2181
|
+
key: "customerTotal",
|
|
2182
|
+
width: 150
|
|
2183
|
+
},
|
|
2184
|
+
divideSellTotal: {
|
|
2185
|
+
component: BsHeaderChild,
|
|
2186
|
+
name: "实付金额",
|
|
2187
|
+
key: "divideSellTotal",
|
|
2188
|
+
width: 150
|
|
2189
|
+
},
|
|
2190
|
+
isGift: {
|
|
2191
|
+
component: BsHeaderChild,
|
|
2192
|
+
name: "是否赠品",
|
|
2193
|
+
key: "isGift",
|
|
2194
|
+
width: 150,
|
|
2195
|
+
transformValue: function transformValue(val) {
|
|
2196
|
+
if (isNull(val)) return "--";
|
|
2197
|
+
return val === "1" ? "是" : "否";
|
|
2198
|
+
},
|
|
2199
|
+
renderExport: function renderExport(val) {
|
|
2200
|
+
if (isNull(val)) return "--";
|
|
2201
|
+
return val === "1" ? "是" : "否";
|
|
2202
|
+
}
|
|
2203
|
+
},
|
|
2204
|
+
isFit: {
|
|
2205
|
+
component: BsHeaderChild,
|
|
2206
|
+
name: "是否组合装",
|
|
2207
|
+
key: "isFit",
|
|
2208
|
+
width: 150,
|
|
2209
|
+
transformValue: function transformValue(val) {
|
|
2210
|
+
if (isNull(val)) return "--";
|
|
2211
|
+
return val === "1" ? "是" : "否";
|
|
2212
|
+
},
|
|
2213
|
+
renderExport: function renderExport(val) {
|
|
2214
|
+
if (isNull(val)) return "--";
|
|
2215
|
+
return val === "1" ? "是" : "否";
|
|
2216
|
+
}
|
|
2217
|
+
},
|
|
2218
|
+
isPresell: {
|
|
2219
|
+
component: BsHeaderChild,
|
|
2220
|
+
name: "是否预售货品",
|
|
2221
|
+
key: "isPresell",
|
|
2222
|
+
width: 150,
|
|
2223
|
+
transformValue: function transformValue(val) {
|
|
2224
|
+
if (isNull(val)) return "--";
|
|
2225
|
+
return val === "1" ? "是" : "否";
|
|
2226
|
+
},
|
|
2227
|
+
renderExport: function renderExport(val) {
|
|
2228
|
+
if (isNull(val)) return "--";
|
|
2229
|
+
return val === "1" ? "是" : "否";
|
|
2230
|
+
}
|
|
2231
|
+
},
|
|
2232
|
+
brandName: {
|
|
2233
|
+
component: BsHeaderChild,
|
|
2234
|
+
name: "品牌",
|
|
2235
|
+
key: "brandName",
|
|
2236
|
+
width: 200
|
|
2237
|
+
},
|
|
2238
|
+
cateName: {
|
|
2239
|
+
component: BsHeaderChild,
|
|
2240
|
+
name: "货品类别",
|
|
2241
|
+
key: "cateName",
|
|
2242
|
+
width: 150
|
|
2243
|
+
},
|
|
2244
|
+
goodsTags: {
|
|
2245
|
+
component: BsHeaderChild,
|
|
2246
|
+
name: "货品标签",
|
|
2247
|
+
key: "goodsTags",
|
|
2248
|
+
width: 250
|
|
2249
|
+
},
|
|
2250
|
+
goodsMemo: {
|
|
2251
|
+
component: BsHeaderChild,
|
|
2252
|
+
name: "货品备注",
|
|
2253
|
+
key: "goodsMemo",
|
|
2254
|
+
width: 250
|
|
2255
|
+
},
|
|
2256
|
+
tradeGoodsNo: {
|
|
2257
|
+
component: BsHeaderChild,
|
|
2258
|
+
name: "交易货品编号",
|
|
2259
|
+
key: "tradeGoodsNo",
|
|
2260
|
+
width: 250
|
|
2261
|
+
},
|
|
2262
|
+
tradeGoodsName: {
|
|
2263
|
+
component: BsHeaderChild,
|
|
2264
|
+
name: "交易货品名称",
|
|
2265
|
+
key: "tradeGoodsName",
|
|
2266
|
+
width: 250
|
|
2267
|
+
},
|
|
2268
|
+
tradeGoodsSpec: {
|
|
2269
|
+
component: BsHeaderChild,
|
|
2270
|
+
name: "交易规格名称",
|
|
2271
|
+
key: "tradeGoodsSpec",
|
|
2272
|
+
width: 250
|
|
2273
|
+
},
|
|
2274
|
+
sourceSubtradeNo: {
|
|
2275
|
+
component: BsHeaderChild,
|
|
2276
|
+
name: "网店子订单号",
|
|
2277
|
+
key: "sourceSubtradeNo",
|
|
2278
|
+
width: 250
|
|
2279
|
+
},
|
|
2280
|
+
platGoodsId: {
|
|
2281
|
+
component: BsHeaderChild,
|
|
2282
|
+
name: "平台商品ID",
|
|
2283
|
+
key: "platGoodsId",
|
|
2284
|
+
width: 250
|
|
2285
|
+
},
|
|
2286
|
+
subTradeId: {
|
|
2287
|
+
component: BsHeaderChild,
|
|
2288
|
+
name: "商品明细ID",
|
|
2289
|
+
key: "subTradeId",
|
|
2290
|
+
width: 250
|
|
2291
|
+
},
|
|
2292
|
+
batchNo: {
|
|
2293
|
+
component: BsHeaderChild,
|
|
2294
|
+
name: "批次号",
|
|
2295
|
+
key: "batchNo",
|
|
2296
|
+
width: 250
|
|
2297
|
+
},
|
|
2298
|
+
sendCount: {
|
|
2299
|
+
component: BsHeaderChild,
|
|
2300
|
+
name: "批次数量",
|
|
2301
|
+
key: "sendCount",
|
|
2302
|
+
width: 250
|
|
2303
|
+
},
|
|
2304
|
+
productDate: {
|
|
2305
|
+
component: BsHeaderChild,
|
|
2306
|
+
name: "生产日期",
|
|
2307
|
+
key: "productDate",
|
|
2308
|
+
width: 250
|
|
2309
|
+
},
|
|
2310
|
+
expireDate: {
|
|
2311
|
+
component: BsHeaderChild,
|
|
2312
|
+
name: "到期日期",
|
|
2313
|
+
key: "expireDate",
|
|
2314
|
+
width: 250
|
|
2315
|
+
}
|
|
2316
|
+
},
|
|
2317
|
+
itemKey: {
|
|
2318
|
+
goodsNo: "货品编号",
|
|
2319
|
+
goodsName: "货品名称",
|
|
2320
|
+
goodsId: "货品ID",
|
|
2321
|
+
barcode: "货品条码",
|
|
2322
|
+
specName: "规格名称",
|
|
2323
|
+
specId: "规格ID",
|
|
2324
|
+
skuImgUrl: "规格图片",
|
|
2325
|
+
sellCount: "数量",
|
|
2326
|
+
actualSendCount: "实发数量",
|
|
2327
|
+
sellPrice: "单价",
|
|
2328
|
+
sellTotal: "金额",
|
|
2329
|
+
discountTotal: "抵扣金额",
|
|
2330
|
+
shareFavourableFee: "分摊金额",
|
|
2331
|
+
shareFavourableAfterFee: "分摊后金额",
|
|
2332
|
+
customerPrice: "终端销售单价",
|
|
2333
|
+
customerTotal: "终端销售金额",
|
|
2334
|
+
divideSellTotal: "实付金额",
|
|
2335
|
+
isGift: "是否赠品",
|
|
2336
|
+
isFit: "是否组合装",
|
|
2337
|
+
isPresell: "是否预售货品",
|
|
2338
|
+
brandName: "品牌",
|
|
2339
|
+
cateName: "货品类别",
|
|
2340
|
+
goodsTags: "货品标签",
|
|
2341
|
+
goodsMemo: "货品备注",
|
|
2342
|
+
tradeGoodsNo: "交易货品编号",
|
|
2343
|
+
tradeGoodsName: "交易货品名称",
|
|
2344
|
+
tradeGoodsSpec: "交易规格名称",
|
|
2345
|
+
sourceSubtradeNo: "网店子订单号",
|
|
2346
|
+
platGoodsId: "平台商品ID",
|
|
2347
|
+
subTradeId: "商品明细ID",
|
|
2348
|
+
batchNo: "批次号",
|
|
2349
|
+
sendCount: "批次数量",
|
|
2350
|
+
productDate: "生产日期",
|
|
2351
|
+
expireDate: "到期日期"
|
|
2352
|
+
},
|
|
2353
|
+
moneyKey: "sellTotal"
|
|
2354
|
+
},
|
|
2355
|
+
JKY_REISSUE_GOODS: {
|
|
2356
|
+
headerMap: {
|
|
2357
|
+
goodsNo: {
|
|
2358
|
+
component: BsHeaderChild,
|
|
2359
|
+
name: "货品编号",
|
|
2360
|
+
key: "goodsNo",
|
|
2361
|
+
width: 150
|
|
2362
|
+
},
|
|
2363
|
+
goodsName: {
|
|
2364
|
+
component: BsHeaderChild,
|
|
2365
|
+
name: "货品名称",
|
|
2366
|
+
key: "goodsName",
|
|
2367
|
+
width: 150
|
|
2368
|
+
},
|
|
2369
|
+
goodsId: {
|
|
2370
|
+
component: BsHeaderChild,
|
|
2371
|
+
name: "货品ID",
|
|
2372
|
+
key: "goodsId",
|
|
2373
|
+
width: 150
|
|
2374
|
+
},
|
|
2375
|
+
barcode: {
|
|
2376
|
+
component: BsHeaderChild,
|
|
2377
|
+
name: "货品条码",
|
|
2378
|
+
key: "barcode",
|
|
2379
|
+
width: 150
|
|
2380
|
+
},
|
|
2381
|
+
specName: {
|
|
2382
|
+
component: BsHeaderChild,
|
|
2383
|
+
name: "规格名称",
|
|
2384
|
+
key: "specName",
|
|
2385
|
+
width: 150
|
|
2386
|
+
},
|
|
2387
|
+
specId: {
|
|
2388
|
+
component: BsHeaderChild,
|
|
2389
|
+
name: "规格ID",
|
|
2390
|
+
key: "specId",
|
|
2391
|
+
width: 150
|
|
2392
|
+
},
|
|
2393
|
+
skuImgUrl: {
|
|
2394
|
+
component: BsHeaderPic,
|
|
2395
|
+
name: "规格图片",
|
|
2396
|
+
key: "skuImgUrl",
|
|
2397
|
+
width: 150
|
|
2398
|
+
},
|
|
2399
|
+
sellCount: {
|
|
2400
|
+
component: BsHeaderChild,
|
|
2401
|
+
name: "发货数量",
|
|
2402
|
+
key: "sellCount",
|
|
2403
|
+
width: 100
|
|
2404
|
+
},
|
|
2405
|
+
sellPrice: {
|
|
2406
|
+
component: BsHeaderChild,
|
|
2407
|
+
name: "单价",
|
|
2408
|
+
key: "sellPrice",
|
|
2409
|
+
width: 150
|
|
2410
|
+
},
|
|
2411
|
+
sellTotal: {
|
|
2412
|
+
component: BsHeaderChild,
|
|
2413
|
+
name: "总金额",
|
|
2414
|
+
key: "sellTotal",
|
|
2415
|
+
width: 150
|
|
2416
|
+
},
|
|
2417
|
+
reason: {
|
|
2418
|
+
component: BsHeaderChild,
|
|
2419
|
+
name: "退换原因",
|
|
2420
|
+
key: "reason",
|
|
2421
|
+
width: 250
|
|
2422
|
+
},
|
|
2423
|
+
isGift: {
|
|
2424
|
+
component: BsHeaderChild,
|
|
2425
|
+
name: "是否赠品",
|
|
2426
|
+
key: "isGift",
|
|
2427
|
+
width: 150,
|
|
2428
|
+
transformValue: function transformValue(val) {
|
|
2429
|
+
if (isNull(val)) return "--";
|
|
2430
|
+
return val === "1" ? "是" : "否";
|
|
2431
|
+
},
|
|
2432
|
+
renderExport: function renderExport(val) {
|
|
2433
|
+
if (isNull(val)) return "--";
|
|
2434
|
+
return val === "1" ? "是" : "否";
|
|
2435
|
+
}
|
|
2436
|
+
},
|
|
2437
|
+
isFit: {
|
|
2438
|
+
component: BsHeaderChild,
|
|
2439
|
+
name: "是否组合装",
|
|
2440
|
+
key: "isFit",
|
|
2441
|
+
width: 150,
|
|
2442
|
+
transformValue: function transformValue(val) {
|
|
2443
|
+
if (isNull(val)) return "--";
|
|
2444
|
+
return val === "1" ? "是" : "否";
|
|
2445
|
+
},
|
|
2446
|
+
renderExport: function renderExport(val) {
|
|
2447
|
+
if (isNull(val)) return "--";
|
|
2448
|
+
return val === "1" ? "是" : "否";
|
|
2449
|
+
}
|
|
2450
|
+
},
|
|
2451
|
+
brandName: {
|
|
2452
|
+
component: BsHeaderChild,
|
|
2453
|
+
name: "品牌",
|
|
2454
|
+
key: "brandName",
|
|
2455
|
+
width: 150
|
|
2456
|
+
},
|
|
2457
|
+
cateName: {
|
|
2458
|
+
component: BsHeaderChild,
|
|
2459
|
+
name: "货品类别",
|
|
2460
|
+
key: "cateName",
|
|
2461
|
+
width: 150
|
|
2462
|
+
}
|
|
2463
|
+
},
|
|
2464
|
+
itemKey: {
|
|
2465
|
+
goodsNo: "货品编号",
|
|
2466
|
+
goodsName: "货品名称",
|
|
2467
|
+
goodsId: "货品ID",
|
|
2468
|
+
barcode: "货品条码",
|
|
2469
|
+
specName: "规格名称",
|
|
2470
|
+
specId: "规格ID",
|
|
2471
|
+
skuImgUrl: "规格图片",
|
|
2472
|
+
sellCount: "发货数量",
|
|
2473
|
+
sellPrice: "单价",
|
|
2474
|
+
sellTotal: "总金额",
|
|
2475
|
+
reason: "退换原因",
|
|
2476
|
+
isGift: "是否赠品",
|
|
2477
|
+
isFit: "是否组合装",
|
|
2478
|
+
brandName: "品牌",
|
|
2479
|
+
cateName: "货品类别"
|
|
2480
|
+
},
|
|
2481
|
+
moneyKey: "sellTotal"
|
|
2085
2482
|
}
|
|
2086
2483
|
};
|
|
2087
2484
|
GoodHeaderMap["WDT_REISSUE_GOODS"] = GoodHeaderMap["WDT_GOODS"];
|
|
@@ -133,6 +133,41 @@ var typeMap = {
|
|
|
133
133
|
idKey: "systemOrderId",
|
|
134
134
|
failValue: "失败",
|
|
135
135
|
dataType: "array_object"
|
|
136
|
+
},
|
|
137
|
+
JKY_WAREHOUSING_STATUS: {
|
|
138
|
+
options: [{
|
|
139
|
+
value: "0",
|
|
140
|
+
label: "未收货",
|
|
141
|
+
color: "#ff4d4f"
|
|
142
|
+
}, {
|
|
143
|
+
value: "1",
|
|
144
|
+
label: "部分收货",
|
|
145
|
+
color: "#e7780f"
|
|
146
|
+
}, {
|
|
147
|
+
value: "2",
|
|
148
|
+
label: "收货完成",
|
|
149
|
+
color: "#52c41a"
|
|
150
|
+
}, {
|
|
151
|
+
label: "收货完成-少收",
|
|
152
|
+
value: "3",
|
|
153
|
+
color: "#e7780f"
|
|
154
|
+
}, {
|
|
155
|
+
label: "收货完成-超收",
|
|
156
|
+
value: "4",
|
|
157
|
+
color: "#e7780f"
|
|
158
|
+
}, {
|
|
159
|
+
label: "无需收货",
|
|
160
|
+
value: "5",
|
|
161
|
+
color: "#52c41a"
|
|
162
|
+
}],
|
|
163
|
+
key: "jkyInStockStatusItemList",
|
|
164
|
+
code: "jkyInStockStatusList",
|
|
165
|
+
name: "商品入库状态(勿填)",
|
|
166
|
+
type: 2,
|
|
167
|
+
valueKey: "status",
|
|
168
|
+
idKey: "sourceTradeNo",
|
|
169
|
+
failValue: "失败",
|
|
170
|
+
dataType: "array_object"
|
|
136
171
|
}
|
|
137
172
|
};
|
|
138
173
|
var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(options) {
|
|
@@ -158,7 +193,7 @@ var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(opt
|
|
|
158
193
|
_defineProperty(this, "dataType", void 0);
|
|
159
194
|
_defineProperty(this, "isSingleValue", void 0);
|
|
160
195
|
_defineProperty(this, "renderClient", function (record) {
|
|
161
|
-
var _typeMap$_this$type, _typeMap$_this$type2, _typeMap$_this$type3;
|
|
196
|
+
var _typeMap$_this$type, _typeMap$_this$type2, _typeMap$_this$type3, _typeMap$_this$type4;
|
|
162
197
|
var isShow = Array.isArray(record === null || record === void 0 ? void 0 : record[_this.id]) ? some(record === null || record === void 0 ? void 0 : record[_this.id], function (item) {
|
|
163
198
|
return !isNull(item);
|
|
164
199
|
}) : false;
|
|
@@ -167,16 +202,17 @@ var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(opt
|
|
|
167
202
|
label: _this.name,
|
|
168
203
|
value: /*#__PURE__*/React.createElement(CommonOrderContent, {
|
|
169
204
|
list: record === null || record === void 0 ? void 0 : record[_this.id],
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
205
|
+
idKey: (_typeMap$_this$type = typeMap[_this.type]) === null || _typeMap$_this$type === void 0 ? void 0 : _typeMap$_this$type.idKey,
|
|
206
|
+
valueKey: (_typeMap$_this$type2 = typeMap[_this.type]) === null || _typeMap$_this$type2 === void 0 ? void 0 : _typeMap$_this$type2.valueKey,
|
|
207
|
+
failValue: (_typeMap$_this$type3 = typeMap[_this.type]) === null || _typeMap$_this$type3 === void 0 ? void 0 : _typeMap$_this$type3.failValue,
|
|
208
|
+
options: (_typeMap$_this$type4 = typeMap[_this.type]) === null || _typeMap$_this$type4 === void 0 ? void 0 : _typeMap$_this$type4.options,
|
|
173
209
|
isShowPopover: !_this.isSingleValue
|
|
174
210
|
})
|
|
175
211
|
}) : null;
|
|
176
212
|
});
|
|
177
213
|
_defineProperty(this, "renderPc", function (value, record) {
|
|
178
|
-
var _typeMap$_this$
|
|
179
|
-
var list = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_").concat((_typeMap$_this$
|
|
214
|
+
var _typeMap$_this$type5, _typeMap$_this$type6, _typeMap$_this$type7, _typeMap$_this$type8, _typeMap$_this$type9;
|
|
215
|
+
var list = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_").concat((_typeMap$_this$type5 = typeMap[_this.type]) === null || _typeMap$_this$type5 === void 0 ? void 0 : _typeMap$_this$type5.key)];
|
|
180
216
|
//兼容多个商品
|
|
181
217
|
return /*#__PURE__*/React.createElement("span", {
|
|
182
218
|
onClick: function onClick(e) {
|
|
@@ -184,40 +220,41 @@ var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(opt
|
|
|
184
220
|
}
|
|
185
221
|
}, /*#__PURE__*/React.createElement(CommonOrderContent, {
|
|
186
222
|
list: list,
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
223
|
+
idKey: (_typeMap$_this$type6 = typeMap[_this.type]) === null || _typeMap$_this$type6 === void 0 ? void 0 : _typeMap$_this$type6.idKey,
|
|
224
|
+
valueKey: (_typeMap$_this$type7 = typeMap[_this.type]) === null || _typeMap$_this$type7 === void 0 ? void 0 : _typeMap$_this$type7.valueKey,
|
|
225
|
+
failValue: (_typeMap$_this$type8 = typeMap[_this.type]) === null || _typeMap$_this$type8 === void 0 ? void 0 : _typeMap$_this$type8.failValue,
|
|
226
|
+
options: (_typeMap$_this$type9 = typeMap[_this.type]) === null || _typeMap$_this$type9 === void 0 ? void 0 : _typeMap$_this$type9.options,
|
|
190
227
|
isShowPopover: !_this.isSingleValue
|
|
191
228
|
}));
|
|
192
229
|
});
|
|
193
230
|
_defineProperty(this, "renderLog", function (r) {
|
|
194
|
-
var _typeMap$_this$
|
|
195
|
-
var list = r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_").concat((_typeMap$_this$
|
|
231
|
+
var _typeMap$_this$type10;
|
|
232
|
+
var list = r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_").concat((_typeMap$_this$type10 = typeMap[_this.type]) === null || _typeMap$_this$type10 === void 0 ? void 0 : _typeMap$_this$type10.key)];
|
|
196
233
|
if (isNull(list)) return null;
|
|
197
234
|
return _this.renderPc(undefined, r);
|
|
198
235
|
});
|
|
199
236
|
_defineProperty(this, "getComponentValue", function (r) {
|
|
200
|
-
var _typeMap$_this$
|
|
201
|
-
return r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_").concat((_typeMap$_this$
|
|
237
|
+
var _typeMap$_this$type11;
|
|
238
|
+
return r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_").concat((_typeMap$_this$type11 = typeMap[_this.type]) === null || _typeMap$_this$type11 === void 0 ? void 0 : _typeMap$_this$type11.key)];
|
|
202
239
|
});
|
|
203
240
|
_defineProperty(this, "renderExport", function (value, record) {
|
|
204
|
-
var _typeMap$_this$
|
|
205
|
-
var list = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_").concat((_typeMap$_this$
|
|
241
|
+
var _typeMap$_this$type12;
|
|
242
|
+
var list = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_").concat((_typeMap$_this$type12 = typeMap[_this.type]) === null || _typeMap$_this$type12 === void 0 ? void 0 : _typeMap$_this$type12.key)];
|
|
206
243
|
return (list || []).map(function (item) {
|
|
207
|
-
var _typeMap$_this$
|
|
208
|
-
var currentOption = (_typeMap$_this$
|
|
209
|
-
var _typeMap$_this$
|
|
210
|
-
return item[(_typeMap$_this$
|
|
244
|
+
var _typeMap$_this$type13, _typeMap$_this$type14, _typeMap$_this$type15, _typeMap$_this$type18, _typeMap$_this$type19;
|
|
245
|
+
var currentOption = (_typeMap$_this$type13 = typeMap[_this.type]) === null || _typeMap$_this$type13 === void 0 ? void 0 : (_typeMap$_this$type14 = _typeMap$_this$type13.options) === null || _typeMap$_this$type14 === void 0 ? void 0 : (_typeMap$_this$type15 = _typeMap$_this$type14.find) === null || _typeMap$_this$type15 === void 0 ? void 0 : _typeMap$_this$type15.call(_typeMap$_this$type14, function (option) {
|
|
246
|
+
var _typeMap$_this$type16;
|
|
247
|
+
return item[(_typeMap$_this$type16 = typeMap[_this.type]) === null || _typeMap$_this$type16 === void 0 ? void 0 : _typeMap$_this$type16.valueKey] === option.value;
|
|
211
248
|
});
|
|
212
249
|
if (_this.isSingleValue) {
|
|
213
|
-
var _typeMap$_this$
|
|
214
|
-
return currentOption ? (currentOption === null || currentOption === void 0 ? void 0 : currentOption.label) || "" : (item === null || item === void 0 ? void 0 : item[(_typeMap$_this$
|
|
250
|
+
var _typeMap$_this$type17;
|
|
251
|
+
return currentOption ? (currentOption === null || currentOption === void 0 ? void 0 : currentOption.label) || "" : (item === null || item === void 0 ? void 0 : item[(_typeMap$_this$type17 = typeMap[_this.type]) === null || _typeMap$_this$type17 === void 0 ? void 0 : _typeMap$_this$type17.valueKey]) || "";
|
|
215
252
|
}
|
|
216
|
-
return "".concat(item === null || item === void 0 ? void 0 : item[(_typeMap$_this$
|
|
253
|
+
return "".concat(item === null || item === void 0 ? void 0 : item[(_typeMap$_this$type18 = typeMap[_this.type]) === null || _typeMap$_this$type18 === void 0 ? void 0 : _typeMap$_this$type18.idKey], ":").concat(currentOption ? (currentOption === null || currentOption === void 0 ? void 0 : currentOption.label) || "" : (item === null || item === void 0 ? void 0 : item[(_typeMap$_this$type19 = typeMap[_this.type]) === null || _typeMap$_this$type19 === void 0 ? void 0 : _typeMap$_this$type19.valueKey]) || "");
|
|
217
254
|
}).join(",");
|
|
218
255
|
});
|
|
219
256
|
_defineProperty(this, "editRender", function (p) {
|
|
220
|
-
var _this$componentConfig, _this$componentConfig2, _this$componentConfig3, _this$componentConfig4, _typeMap$_this$
|
|
257
|
+
var _this$componentConfig, _this$componentConfig2, _this$componentConfig3, _this$componentConfig4, _typeMap$_this$type20;
|
|
221
258
|
return /*#__PURE__*/React.createElement(GetFormItem, {
|
|
222
259
|
title: _this.name,
|
|
223
260
|
name: _this.id,
|
|
@@ -227,19 +264,19 @@ var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(opt
|
|
|
227
264
|
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,
|
|
228
265
|
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 : "",
|
|
229
266
|
component: /*#__PURE__*/React.createElement(Status, _extends({}, _this.componentConfig, {
|
|
230
|
-
type: (_typeMap$_this$
|
|
267
|
+
type: (_typeMap$_this$type20 = typeMap[_this.type]) === null || _typeMap$_this$type20 === void 0 ? void 0 : _typeMap$_this$type20.type,
|
|
231
268
|
failValue: typeMap[_this.type].failValue
|
|
232
269
|
}))
|
|
233
270
|
});
|
|
234
271
|
});
|
|
235
272
|
_defineProperty(this, "filterConfig", function (item) {
|
|
236
|
-
var _typeMap$_this$
|
|
273
|
+
var _typeMap$_this$type21, _item$templateConfig;
|
|
237
274
|
return {
|
|
238
|
-
searchDefaultConditions: ["BS_E3_WAREHOUSING_STATUS", "WAREHOUSING_STATUS", "WDT_WAREHOUSING_STATUS"].includes(_this.type) ? SYMBOL.in : SYMBOL.like,
|
|
275
|
+
searchDefaultConditions: ["BS_E3_WAREHOUSING_STATUS", "WAREHOUSING_STATUS", "WDT_WAREHOUSING_STATUS", "JKY_WAREHOUSING_STATUS"].includes(_this.type) ? SYMBOL.in : SYMBOL.like,
|
|
239
276
|
type: item.type,
|
|
240
|
-
id: "".concat(item.id, "_").concat((_typeMap$_this$
|
|
277
|
+
id: "".concat(item.id, "_").concat((_typeMap$_this$type21 = typeMap[_this.type]) === null || _typeMap$_this$type21 === void 0 ? void 0 : _typeMap$_this$type21.code),
|
|
241
278
|
name: "".concat(_this.name),
|
|
242
|
-
filterComponentType: ["BS_E3_WAREHOUSING_STATUS", "WAREHOUSING_STATUS", "WDT_WAREHOUSING_STATUS"].includes(_this.type) ? "MultipleSelect" : "SelectInput",
|
|
279
|
+
filterComponentType: ["BS_E3_WAREHOUSING_STATUS", "WAREHOUSING_STATUS", "WDT_WAREHOUSING_STATUS", "JKY_WAREHOUSING_STATUS"].includes(_this.type) ? "MultipleSelect" : "SelectInput",
|
|
243
280
|
props: {
|
|
244
281
|
options: item === null || item === void 0 ? void 0 : (_item$templateConfig = item.templateConfig) === null || _item$templateConfig === void 0 ? void 0 : _item$templateConfig.reasonList,
|
|
245
282
|
fieldNames: {
|
|
@@ -250,11 +287,11 @@ var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(opt
|
|
|
250
287
|
},
|
|
251
288
|
filterFn: function filterFn(value) {
|
|
252
289
|
return function (i) {
|
|
253
|
-
var _typeMap$_this$
|
|
254
|
-
return _filterFn.filterSplitComma(_filterFn.filterTableListItemColumnValue(i, item.id, (_typeMap$_this$
|
|
290
|
+
var _typeMap$_this$type22;
|
|
291
|
+
return _filterFn.filterSplitComma(_filterFn.filterTableListItemColumnValue(i, item.id, (_typeMap$_this$type22 = typeMap[_this.type]) === null || _typeMap$_this$type22 === void 0 ? void 0 : _typeMap$_this$type22.code), value);
|
|
255
292
|
};
|
|
256
293
|
},
|
|
257
|
-
formatFilterValue: ["BS_E3_WAREHOUSING_STATUS", "WAREHOUSING_STATUS", "WDT_WAREHOUSING_STATUS"].includes(_this.type) ? null : function (value) {
|
|
294
|
+
formatFilterValue: ["BS_E3_WAREHOUSING_STATUS", "WAREHOUSING_STATUS", "WDT_WAREHOUSING_STATUS", "JKY_WAREHOUSING_STATUS"].includes(_this.type) ? null : function (value) {
|
|
258
295
|
if (value.type === "in") {
|
|
259
296
|
return value.keywords;
|
|
260
297
|
} else {
|
|
@@ -279,17 +316,17 @@ var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(opt
|
|
|
279
316
|
required: true,
|
|
280
317
|
validator: function validator(_, value) {
|
|
281
318
|
var hasNo = (value || []).some(function (item) {
|
|
282
|
-
var _typeMap$_this$
|
|
283
|
-
return item[(_typeMap$_this$
|
|
319
|
+
var _typeMap$_this$type23;
|
|
320
|
+
return item[(_typeMap$_this$type23 = typeMap[_this.type]) === null || _typeMap$_this$type23 === void 0 ? void 0 : _typeMap$_this$type23.valueKey];
|
|
284
321
|
});
|
|
285
322
|
if (!hasNo) {
|
|
286
|
-
var _typeMap$_this$
|
|
287
|
-
return Promise.reject(new Error("\u81F3\u5C11\u586B\u5199\u4E00\u4E2A\u5B8C\u6574\u7684".concat((_typeMap$_this$
|
|
323
|
+
var _typeMap$_this$type24;
|
|
324
|
+
return Promise.reject(new Error("\u81F3\u5C11\u586B\u5199\u4E00\u4E2A\u5B8C\u6574\u7684".concat((_typeMap$_this$type24 = typeMap[_this.type]) === null || _typeMap$_this$type24 === void 0 ? void 0 : _typeMap$_this$type24.name)));
|
|
288
325
|
}
|
|
289
326
|
return Promise.resolve();
|
|
290
327
|
}
|
|
291
328
|
}] : [];
|
|
292
329
|
this.align = "left";
|
|
293
|
-
this.isSingleValue = ((_this$componentConfig6 = this.componentConfig) === null || _this$componentConfig6 === void 0 ? void 0 : _this$componentConfig6.belongType) === "wdt" || this.type === "BS_E3_WAREHOUSING_STATUS" || this.type === "WDT_WAREHOUSING_STATUS";
|
|
330
|
+
this.isSingleValue = ((_this$componentConfig6 = this.componentConfig) === null || _this$componentConfig6 === void 0 ? void 0 : _this$componentConfig6.belongType) === "wdt" || this.type === "BS_E3_WAREHOUSING_STATUS" || this.type === "WDT_WAREHOUSING_STATUS" || this.type === "JKY_WAREHOUSING_STATUS";
|
|
294
331
|
});
|
|
295
332
|
export default CommonMultiStatus;
|
|
@@ -78,6 +78,14 @@ var typeMap = {
|
|
|
78
78
|
sendName: "jySendName",
|
|
79
79
|
platformType: "jy",
|
|
80
80
|
dataType: "weakenArray"
|
|
81
|
+
},
|
|
82
|
+
JKY_SEND_GOOD: {
|
|
83
|
+
key: "jkySendGood",
|
|
84
|
+
name: "jky",
|
|
85
|
+
sendId: "jkySendId",
|
|
86
|
+
sendName: "jkySendName",
|
|
87
|
+
platformType: "jky",
|
|
88
|
+
dataType: "weakenArray"
|
|
81
89
|
}
|
|
82
90
|
};
|
|
83
91
|
var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(_options) {
|
|
@@ -184,7 +192,7 @@ var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(_options) {
|
|
|
184
192
|
});
|
|
185
193
|
_defineProperty(this, "filterConfig", function (item) {
|
|
186
194
|
var _typeMap$_this$type8, _typeMap$_this$type9, _typeMap$_this$type11;
|
|
187
|
-
return [["WDT_SEND_GOOD", "BS_E3_SEND_GOOD", "GY_SEND_GOOD", "JY_SEND_GOOD"].includes(_this.type) ? {
|
|
195
|
+
return [["WDT_SEND_GOOD", "BS_E3_SEND_GOOD", "GY_SEND_GOOD", "JY_SEND_GOOD", "JKY_SEND_GOOD"].includes(_this.type) ? {
|
|
188
196
|
searchDefaultConditions: SYMBOL.in,
|
|
189
197
|
type: item.type,
|
|
190
198
|
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", "JY_SEND_GOOD"].includes(_this.type) ? {
|
|
109
|
+
return [["WDT_SEND_GOOD", "BS_E3_SEND_GOOD", "GY_SEND_GOOD", "JY_SEND_GOOD", "JKY_SEND_GOOD"].includes(_this.type) ? {
|
|
110
110
|
searchDefaultConditions: SYMBOL.in,
|
|
111
111
|
type: item.type,
|
|
112
112
|
id: "".concat(item.id, "_").concat(_this.suffixSendName),
|
|
@@ -92,6 +92,24 @@ var typeMap = {
|
|
|
92
92
|
}
|
|
93
93
|
return Promise.resolve();
|
|
94
94
|
}
|
|
95
|
+
},
|
|
96
|
+
JKY_REISSUE_GOODS: {
|
|
97
|
+
key: "jkyReissueGoods",
|
|
98
|
+
typeName: "jkyReissueType",
|
|
99
|
+
remark: "jkyReissueType_memo",
|
|
100
|
+
systemOrderNo: "jkySystemOrderNo",
|
|
101
|
+
systemOrderBillType: "jkySystemOrderBillType",
|
|
102
|
+
errMsg: "请选择吉客云补发商品",
|
|
103
|
+
name: "吉客云",
|
|
104
|
+
compType: "补发",
|
|
105
|
+
validator: function validator(_rule, value, type) {
|
|
106
|
+
if (!_rule.required) return Promise.resolve();
|
|
107
|
+
var validatorFlag = erpFormValidator(_rule, value, type);
|
|
108
|
+
if (validatorFlag) {
|
|
109
|
+
return validatorFlag;
|
|
110
|
+
}
|
|
111
|
+
return Promise.resolve();
|
|
112
|
+
}
|
|
95
113
|
}
|
|
96
114
|
};
|
|
97
115
|
var PublicReissue = /*#__PURE__*/_createClass(function PublicReissue(options) {
|
package/dist/esm/factory.d.ts
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { ReissueLogistics, JstItemSelect, JstSupply, JstSendGood, BasicInput, BasicAddress, BasicCascader, BasicCheckbox, BasicDataTime, BasicSelect, BasicRadio, BasicTextArea, BasicPicture, BasicPicturePro, BasicMultSelect, BasicGrade, BasicRate, BasicFile, BasicPosting, SubForm, CommonDataTime, TradeId, ShopName, BuyerNick, ReceiverName, ReceiverMobile, ReceiverAddress, TradeDateTime, Logistics, ReturnLogistics, ActualPayment, ERemark, AliPay, ItemSelect, ItemId, ItemEnCode, SystemOrderNo, Ordinary, ThirdItemSelect, FlowStatusSelect, FlowMarkSelect, FlowTag, Payment, TemplateSelect, WorkOrderId, PlatForm, ShopInput, Submitter, PrevSubmitter, FlowCreator, Handler, CompletedUser, LogisticsInterception, LogisticsMoreInterception, LogisticsTrajectory, LogisticsMoreTrajectory, FlowWorkOrderId, BsGoods, BsExchange, BsReissue, BsReturn, BsSystemOrder, BsLogistics, StatusSelect, CommonSystemOrder, CommonMultiStatus, Calculation, NodeDeadLine, HandlerDeadLine, NodeStayDuration, WlnGoods, BsPosting, MsgStatus, NodeInput, FlowWorkOrderStatus, WdtGoods, WdtReturn, WdtExchange, CommonInput, PaymentVoucherCode, Label, WdtReissue, GyReissue, AfterSalesOrderId, BsE3Goods, PublicGoods, PublicReissueGoods, PublicExchange, GyGoods, BsE3Reissue, MemberLevel, GyReturn, AsyncSelect, WdtShopSelect, KmVideo, BasicTypeInput, SkxIdInputSelect, SkxGoods, BasicSelectOption, OrderSubForm, FlowOverallStatusSelect } from "./index";
|
|
2
2
|
import { PickOption } from "./type";
|
|
3
|
-
export declare const factory: (type: string, options: PickOption) => BsLogistics | BsSystemOrder | CommonMultiStatus | JstSendGood | LogisticsMoreInterception | MsgStatus | PublicGoods | PublicReissueGoods |
|
|
3
|
+
export declare const factory: (type: string, options: PickOption) => BsLogistics | BsSystemOrder | BasicCascader | CommonInput | CommonMultiStatus | BasicInput | JstSendGood | LogisticsMoreInterception | MsgStatus | OrderSubForm | Payment | BasicPicturePro | PublicGoods | PublicReissueGoods | ReceiverAddress | StatusSelect | SubForm | BasicTypeInput | BasicAddress | BasicCheckbox | BasicDataTime | BasicSelect | BasicSelectOption | BasicRadio | BasicTextArea | BasicPicture | BasicMultSelect | BasicGrade | BasicRate | BasicFile | BasicPosting | CommonDataTime | TradeId | ShopName | BuyerNick | ReceiverName | ReceiverMobile | TradeDateTime | Logistics | ReturnLogistics | ActualPayment | ERemark | AliPay | ItemSelect | ItemId | ItemEnCode | SystemOrderNo | Ordinary | ThirdItemSelect | ReissueLogistics | JstItemSelect | JstSupply | BsGoods | BsE3Goods | PublicExchange | BsE3Reissue | BsExchange | BsReissue | BsReturn | FlowStatusSelect | FlowMarkSelect | FlowTag | TemplateSelect | WorkOrderId | LogisticsInterception | LogisticsTrajectory | LogisticsMoreTrajectory | PlatForm | ShopInput | Submitter | PrevSubmitter | FlowCreator | Handler | CompletedUser | FlowWorkOrderId | Calculation | CommonSystemOrder | NodeDeadLine | HandlerDeadLine | NodeStayDuration | WlnGoods | BsPosting | NodeInput | FlowWorkOrderStatus | WdtGoods | WdtReissue | WdtReturn | WdtExchange | WdtShopSelect | KmVideo | PaymentVoucherCode | Label | MemberLevel | AfterSalesOrderId | GyGoods | GyReissue | GyReturn | AsyncSelect | SkxIdInputSelect | SkxGoods | FlowOverallStatusSelect;
|
package/dist/esm/factory.js
CHANGED
|
@@ -145,6 +145,7 @@ export var factory = function factory(type, options) {
|
|
|
145
145
|
case "GY_SYSTEM_ORDER":
|
|
146
146
|
case "JST_SYSTEM_ORDER":
|
|
147
147
|
case "JY_SYSTEM_ORDER":
|
|
148
|
+
case "JKY_SYSTEM_ORDER":
|
|
148
149
|
case "WDT_RETURN_BILL_NO":
|
|
149
150
|
return new BsSystemOrder(options);
|
|
150
151
|
case "JST_SEND_GOOD":
|
|
@@ -155,6 +156,7 @@ export var factory = function factory(type, options) {
|
|
|
155
156
|
case "KM_SEND_GOOD":
|
|
156
157
|
case "GY_SEND_GOOD":
|
|
157
158
|
case "JY_SEND_GOOD":
|
|
159
|
+
case "JKY_SEND_GOOD":
|
|
158
160
|
return new JstSendGood(options);
|
|
159
161
|
case "BS_POSTING":
|
|
160
162
|
return new BsPosting(options);
|
|
@@ -165,6 +167,7 @@ export var factory = function factory(type, options) {
|
|
|
165
167
|
case "GY_GOODS":
|
|
166
168
|
return new GyGoods(options);
|
|
167
169
|
case "JY_GOODS":
|
|
170
|
+
case "JKY_GOODS":
|
|
168
171
|
case "KM_GOODS":
|
|
169
172
|
case "JST_GOODS":
|
|
170
173
|
case "WDT_AFTERSALE_GOODS":
|
|
@@ -173,6 +176,7 @@ export var factory = function factory(type, options) {
|
|
|
173
176
|
case "JST_REISSUE_GOODS":
|
|
174
177
|
case "KM_REISSUE_GOODS":
|
|
175
178
|
case "JY_REISSUE_GOODS":
|
|
179
|
+
case "JKY_REISSUE_GOODS":
|
|
176
180
|
return new PublicReissueGoods(options);
|
|
177
181
|
case "BS_E3_REISSUE_GOODS":
|
|
178
182
|
return new BsE3Reissue(options);
|
|
@@ -210,6 +214,7 @@ export var factory = function factory(type, options) {
|
|
|
210
214
|
case "KM_LOGISTICS":
|
|
211
215
|
case "GY_LOGISTICS":
|
|
212
216
|
case "JY_LOGISTICS":
|
|
217
|
+
case "JKY_LOGISTICS":
|
|
213
218
|
case "SKX_LOGISTICS":
|
|
214
219
|
case "SKX_RETURN_LOGISTICS":
|
|
215
220
|
return new BsLogistics(options);
|
|
@@ -235,6 +240,7 @@ export var factory = function factory(type, options) {
|
|
|
235
240
|
case "WAREHOUSING_STATUS":
|
|
236
241
|
case "BS_E3_WAREHOUSING_STATUS":
|
|
237
242
|
case "WDT_WAREHOUSING_STATUS":
|
|
243
|
+
case "JKY_WAREHOUSING_STATUS":
|
|
238
244
|
return new CommonMultiStatus(options);
|
|
239
245
|
case "MSG_STATUS":
|
|
240
246
|
return new MsgStatus(options);
|
|
@@ -12,6 +12,7 @@ export declare const queryBsE3LogisticsCompany: () => Promise<void>;
|
|
|
12
12
|
export declare const queryJSTLogisticsCompany: () => Promise<void>;
|
|
13
13
|
export declare const queryGYLogisticsCompany: () => Promise<void>;
|
|
14
14
|
export declare const queryJYLogisticsCompany: () => Promise<void>;
|
|
15
|
+
export declare const queryJKYLogisticsCompany: () => Promise<void>;
|
|
15
16
|
export declare const queryWLNLogisticsCompany: () => Promise<void>;
|
|
16
17
|
export declare const queryKMLogisticsCompany: () => Promise<void>;
|
|
17
18
|
export declare const getAlipayBillReceipt: (data: any) => Promise<any>;
|
package/dist/esm/service/api.js
CHANGED
|
@@ -301,6 +301,13 @@ export var queryJYLogisticsCompany = function queryJYLogisticsCompany() {
|
|
|
301
301
|
instance.expressData = data;
|
|
302
302
|
}).catch(console.log);
|
|
303
303
|
};
|
|
304
|
+
export var queryJKYLogisticsCompany = function queryJKYLogisticsCompany() {
|
|
305
|
+
var instance = ExpressData.getInstance("jky");
|
|
306
|
+
console.log("queryJKYLogisticsCompany");
|
|
307
|
+
return servers.JKY.getLogisticsDataAsync().then(function (data) {
|
|
308
|
+
instance.expressData = data;
|
|
309
|
+
}).catch(console.log);
|
|
310
|
+
};
|
|
304
311
|
export var queryWLNLogisticsCompany = function queryWLNLogisticsCompany() {
|
|
305
312
|
var instance = ExpressData.getInstance("wln");
|
|
306
313
|
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.3.
|
|
3
|
+
"version": "2.3.5",
|
|
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.3.
|
|
25
|
-
"@kmkf-fe-packages/kmkf-utils": "2.3.
|
|
24
|
+
"@kmkf-fe-packages/basic-components": "2.3.5",
|
|
25
|
+
"@kmkf-fe-packages/kmkf-utils": "2.3.5",
|
|
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": "45b66a0f00eddfacd6934f1de9c19ef9d4a34bc3",
|
|
45
45
|
"gitHooks": {
|
|
46
46
|
"pre-commit": "lint-staged"
|
|
47
47
|
}
|