@kmkf-fe-packages/services-components 2.2.44-beta.4 → 2.2.44-beta.41

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.
Files changed (25) hide show
  1. package/dist/esm/commonComponents/GlobalContext/hook/useGetHasErpData.d.ts +1 -1
  2. package/dist/esm/commonComponents/GlobalContext/hook/useGetHasErpData.js +3 -2
  3. package/dist/esm/commonComponents/GlobalContext/orderQuery/useGetErpAddressData.js +4 -2
  4. package/dist/esm/commonComponents/GlobalContext/orderQuery/useGetErpLogisticsCompany.js +13 -12
  5. package/dist/esm/commonComponents/QueryLogisticsTrack/index.d.ts +2 -1
  6. package/dist/esm/commonComponents/QueryLogisticsTrack/index.js +4 -2
  7. package/dist/esm/components/BS/BsSystemOrder/index.d.ts +7 -0
  8. package/dist/esm/components/BS/BsSystemOrder/index.js +25 -8
  9. package/dist/esm/components/BS/common/BsMemo.js +2 -1
  10. package/dist/esm/components/BS/common/BsType.js +2 -1
  11. package/dist/esm/components/BS/common/SystemOrderNo.js +2 -1
  12. package/dist/esm/components/Common/index.d.ts +1 -1
  13. package/dist/esm/components/Common/index.js +3 -2
  14. package/dist/esm/components/CommonHeaderGood/index.js +10 -2
  15. package/dist/esm/components/CommonMultiStatus/index.js +73 -36
  16. package/dist/esm/components/LogisticsMoreInterception/index.js +1 -0
  17. package/dist/esm/components/PicturePro/index.d.ts +13 -6
  18. package/dist/esm/components/PicturePro/index.js +38 -25
  19. package/dist/esm/components/Public/Goods/index.d.ts +7 -0
  20. package/dist/esm/components/Public/Goods/index.js +15 -0
  21. package/dist/esm/components/Public/ReissueGoods/index.js +18 -0
  22. package/dist/esm/factory.d.ts +1 -1
  23. package/dist/esm/factory.js +2 -0
  24. package/dist/esm/service/api.js +1 -0
  25. 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
- _context.prev = 9;
41
- _context.next = 12;
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 12:
46
+ case 13:
46
47
  setGlobalState("success");
47
- _context.next = 18;
48
+ _context.next = 19;
48
49
  break;
49
- case 15:
50
- _context.prev = 15;
51
- _context.t0 = _context["catch"](9);
50
+ case 16:
51
+ _context.prev = 16;
52
+ _context.t0 = _context["catch"](10);
52
53
  setGlobalState("failed");
53
- case 18:
54
+ case 19:
54
55
  case "end":
55
56
  return _context.stop();
56
57
  }
57
- }, _callee, null, [[9, 15]]);
58
+ }, _callee, null, [[10, 16]]);
58
59
  }));
59
60
  return function asyncQueryData(_x2, _x3, _x4) {
60
61
  return _ref.apply(this, arguments);
@@ -1,10 +1,11 @@
1
1
  import React from "react";
2
- declare const QueryLogisticsTrack: ({ title, modelWidth, interceptCompany, interceptCode, interceptSenderMobile, interceptCompanyName, }: {
2
+ declare const QueryLogisticsTrack: ({ title, modelWidth, interceptCompany, interceptCode, interceptSenderMobile, interceptCompanyName, shopUk, }: {
3
3
  title?: string | undefined;
4
4
  modelWidth?: string | number | undefined;
5
5
  interceptCompany?: string | undefined;
6
6
  interceptCode: string;
7
7
  interceptSenderMobile?: string | number | undefined;
8
8
  interceptCompanyName?: string | undefined;
9
+ shopUk?: string | undefined;
9
10
  }) => React.JSX.Element;
10
11
  export default QueryLogisticsTrack;
@@ -20,7 +20,8 @@ var QueryLogisticsTrack = function QueryLogisticsTrack(_ref) {
20
20
  interceptCompany = _ref.interceptCompany,
21
21
  interceptCode = _ref.interceptCode,
22
22
  interceptSenderMobile = _ref.interceptSenderMobile,
23
- interceptCompanyName = _ref.interceptCompanyName;
23
+ interceptCompanyName = _ref.interceptCompanyName,
24
+ shopUk = _ref.shopUk;
24
25
  var _useState = useState(""),
25
26
  _useState2 = _slicedToArray(_useState, 2),
26
27
  inputVal = _useState2[0],
@@ -97,7 +98,8 @@ var QueryLogisticsTrack = function QueryLogisticsTrack(_ref) {
97
98
  mailNo: interceptCode,
98
99
  cpCode: interceptCompany,
99
100
  mobile: interceptSenderMobile || mobile,
100
- cpName: interceptCompanyName
101
+ cpName: interceptCompanyName,
102
+ shopUk: shopUk
101
103
  },
102
104
  handleError: function handleError(msg) {
103
105
  msg && message.error(msg);
@@ -13,7 +13,14 @@ declare class BsSystemOrder implements ComponentInterface {
13
13
  canSort: boolean;
14
14
  dataType: ComponentInterface["dataType"];
15
15
  children: ComponentInterface[];
16
+ sortChildField: {
17
+ name: string;
18
+ key: string;
19
+ dataType: string;
20
+ [key: string]: any;
21
+ }[];
16
22
  constructor(options: PickOption);
23
+ getSortChildFields: () => any;
17
24
  renderClient: (record: any) => React.JSX.Element | null;
18
25
  renderPc: () => null;
19
26
  renderLog: (r: Record) => React.JSX.Element | null;
@@ -34,7 +34,7 @@ var BsSystemOrder = /*#__PURE__*/_createClass(function BsSystemOrder(options) {
34
34
  _getSystemShowHead,
35
35
  _typeMap$options$type,
36
36
  _options$componentCon,
37
- _this$componentConfig5;
37
+ _this$componentConfig6;
38
38
  _classCallCheck(this, BsSystemOrder);
39
39
  _defineProperty(this, "name", void 0);
40
40
  _defineProperty(this, "id", void 0);
@@ -48,15 +48,31 @@ var BsSystemOrder = /*#__PURE__*/_createClass(function BsSystemOrder(options) {
48
48
  _defineProperty(this, "canSort", void 0);
49
49
  _defineProperty(this, "dataType", void 0);
50
50
  _defineProperty(this, "children", void 0);
51
+ _defineProperty(this, "sortChildField", void 0);
52
+ _defineProperty(this, "getSortChildFields", function () {
53
+ var _typeMap$_this$type, _this$componentConfig;
54
+ return getSystemShowHead({
55
+ columns: ((_typeMap$_this$type = typeMap[_this.type]) === null || _typeMap$_this$type === void 0 ? void 0 : _typeMap$_this$type.columns) || [],
56
+ showHeader: (_this === null || _this === void 0 ? void 0 : (_this$componentConfig = _this.componentConfig) === null || _this$componentConfig === void 0 ? void 0 : _this$componentConfig.showHeader) || []
57
+ }).filter(function (item) {
58
+ return !["picUrl"].includes(item.dataIndex);
59
+ }).map(function (item) {
60
+ return {
61
+ name: item.title,
62
+ key: "".concat(_this.id, "_").concat(item.dataIndex),
63
+ dataType: "arrayObject"
64
+ };
65
+ });
66
+ });
51
67
  _defineProperty(this, "renderClient", function (record) {
52
- var _this$componentConfig;
68
+ var _this$componentConfig2;
53
69
  return !isNull(record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ItemView, {
54
70
  id: _this.id,
55
71
  label: _this.name,
56
72
  value: /*#__PURE__*/React.createElement(BsSystemOrderTable, {
57
73
  value: record === null || record === void 0 ? void 0 : record["".concat(_this.id)],
58
74
  type: _this.type,
59
- showHeader: ((_this$componentConfig = _this.componentConfig) === null || _this$componentConfig === void 0 ? void 0 : _this$componentConfig.showHeader) || []
75
+ showHeader: ((_this$componentConfig2 = _this.componentConfig) === null || _this$componentConfig2 === void 0 ? void 0 : _this$componentConfig2.showHeader) || []
60
76
  })
61
77
  })) : null;
62
78
  });
@@ -64,7 +80,7 @@ var BsSystemOrder = /*#__PURE__*/_createClass(function BsSystemOrder(options) {
64
80
  return null;
65
81
  });
66
82
  _defineProperty(this, "renderLog", function (r) {
67
- var _this$componentConfig2;
83
+ var _this$componentConfig3;
68
84
  if (isNull(r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_").concat(typeMap[_this.type].key)])) return null;
69
85
  return /*#__PURE__*/React.createElement(BsSystemOrderTable, {
70
86
  value: {
@@ -72,7 +88,7 @@ var BsSystemOrder = /*#__PURE__*/_createClass(function BsSystemOrder(options) {
72
88
  selectIds: r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_").concat(typeMap[_this.type].selectId)]
73
89
  },
74
90
  type: _this.type,
75
- showHeader: ((_this$componentConfig2 = _this.componentConfig) === null || _this$componentConfig2 === void 0 ? void 0 : _this$componentConfig2.showHeader) || []
91
+ showHeader: ((_this$componentConfig3 = _this.componentConfig) === null || _this$componentConfig3 === void 0 ? void 0 : _this$componentConfig3.showHeader) || []
76
92
  });
77
93
  });
78
94
  _defineProperty(this, "getComponentValue", function (r) {
@@ -82,7 +98,7 @@ var BsSystemOrder = /*#__PURE__*/_createClass(function BsSystemOrder(options) {
82
98
  return null;
83
99
  });
84
100
  _defineProperty(this, "editRender", function (p) {
85
- var _this$componentConfig3, _this$componentConfig4;
101
+ var _this$componentConfig4, _this$componentConfig5;
86
102
  return /*#__PURE__*/React.createElement(GetFormItem, {
87
103
  title: _this.name,
88
104
  name: _this.id,
@@ -90,7 +106,7 @@ var BsSystemOrder = /*#__PURE__*/_createClass(function BsSystemOrder(options) {
90
106
  required: false,
91
107
  hidden: p === null || p === void 0 ? void 0 : p.hidden,
92
108
  display: p === null || p === void 0 ? void 0 : p.display,
93
- 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 : "",
109
+ tooltip: (_this$componentConfig4 = _this.componentConfig) !== null && _this$componentConfig4 !== void 0 && _this$componentConfig4.showTooltip ? (_this$componentConfig5 = _this.componentConfig) === null || _this$componentConfig5 === void 0 ? void 0 : _this$componentConfig5.tooltip : "",
94
110
  component: /*#__PURE__*/React.createElement(SystemOrder, _extends({}, _this.componentConfig, {
95
111
  onChange: p === null || p === void 0 ? void 0 : p.onChange,
96
112
  type: _this.type
@@ -132,7 +148,7 @@ var BsSystemOrder = /*#__PURE__*/_createClass(function BsSystemOrder(options) {
132
148
  }));
133
149
  })) || [];
134
150
  this.componentConfig = options === null || options === void 0 ? void 0 : options.componentConfig;
135
- this.rules = this !== null && this !== void 0 && (_this$componentConfig5 = this.componentConfig) !== null && _this$componentConfig5 !== void 0 && _this$componentConfig5.required ? [{
151
+ this.rules = this !== null && this !== void 0 && (_this$componentConfig6 = this.componentConfig) !== null && _this$componentConfig6 !== void 0 && _this$componentConfig6.required ? [{
136
152
  required: true,
137
153
  validator: function validator(_, value) {
138
154
  var _value$selectIds;
@@ -143,5 +159,6 @@ var BsSystemOrder = /*#__PURE__*/_createClass(function BsSystemOrder(options) {
143
159
  }
144
160
  }] : [];
145
161
  this.dataType = "object";
162
+ this.sortChildField = this.getSortChildFields();
146
163
  });
147
164
  export default BsSystemOrder;
@@ -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;
@@ -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;
@@ -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) {
@@ -2147,7 +2147,7 @@ var GoodHeaderMap = {
2147
2147
  },
2148
2148
  sellTotal: {
2149
2149
  component: BsHeaderChild,
2150
- name: "金额",
2150
+ name: "总金额",
2151
2151
  key: "sellTotal",
2152
2152
  width: 150
2153
2153
  },
@@ -2219,7 +2219,15 @@ var GoodHeaderMap = {
2219
2219
  component: BsHeaderChild,
2220
2220
  name: "是否预售货品",
2221
2221
  key: "isPresell",
2222
- width: 150
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
+ }
2223
2231
  },
2224
2232
  brandName: {
2225
2233
  component: BsHeaderChild,
@@ -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
- valueKey: (_typeMap$_this$type = typeMap[_this.type]) === null || _typeMap$_this$type === void 0 ? void 0 : _typeMap$_this$type.valueKey,
171
- failValue: (_typeMap$_this$type2 = typeMap[_this.type]) === null || _typeMap$_this$type2 === void 0 ? void 0 : _typeMap$_this$type2.failValue,
172
- options: (_typeMap$_this$type3 = typeMap[_this.type]) === null || _typeMap$_this$type3 === void 0 ? void 0 : _typeMap$_this$type3.options,
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$type4, _typeMap$_this$type5, _typeMap$_this$type6, _typeMap$_this$type7;
179
- var list = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_").concat((_typeMap$_this$type4 = typeMap[_this.type]) === null || _typeMap$_this$type4 === void 0 ? void 0 : _typeMap$_this$type4.key)];
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
- valueKey: (_typeMap$_this$type5 = typeMap[_this.type]) === null || _typeMap$_this$type5 === void 0 ? void 0 : _typeMap$_this$type5.valueKey,
188
- failValue: (_typeMap$_this$type6 = typeMap[_this.type]) === null || _typeMap$_this$type6 === void 0 ? void 0 : _typeMap$_this$type6.failValue,
189
- options: (_typeMap$_this$type7 = typeMap[_this.type]) === null || _typeMap$_this$type7 === void 0 ? void 0 : _typeMap$_this$type7.options,
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$type8;
195
- var list = r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_").concat((_typeMap$_this$type8 = typeMap[_this.type]) === null || _typeMap$_this$type8 === void 0 ? void 0 : _typeMap$_this$type8.key)];
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$type9;
201
- return r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_").concat((_typeMap$_this$type9 = typeMap[_this.type]) === null || _typeMap$_this$type9 === void 0 ? void 0 : _typeMap$_this$type9.key)];
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$type10;
205
- var list = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_").concat((_typeMap$_this$type10 = typeMap[_this.type]) === null || _typeMap$_this$type10 === void 0 ? void 0 : _typeMap$_this$type10.key)];
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$type11, _typeMap$_this$type12, _typeMap$_this$type13, _typeMap$_this$type16, _typeMap$_this$type17;
208
- var currentOption = (_typeMap$_this$type11 = typeMap[_this.type]) === null || _typeMap$_this$type11 === void 0 ? void 0 : (_typeMap$_this$type12 = _typeMap$_this$type11.options) === null || _typeMap$_this$type12 === void 0 ? void 0 : (_typeMap$_this$type13 = _typeMap$_this$type12.find) === null || _typeMap$_this$type13 === void 0 ? void 0 : _typeMap$_this$type13.call(_typeMap$_this$type12, function (option) {
209
- var _typeMap$_this$type14;
210
- return item[(_typeMap$_this$type14 = typeMap[_this.type]) === null || _typeMap$_this$type14 === void 0 ? void 0 : _typeMap$_this$type14.valueKey] === option.value;
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$type15;
214
- return currentOption ? (currentOption === null || currentOption === void 0 ? void 0 : currentOption.label) || "" : (item === null || item === void 0 ? void 0 : item[(_typeMap$_this$type15 = typeMap[_this.type]) === null || _typeMap$_this$type15 === void 0 ? void 0 : _typeMap$_this$type15.valueKey]) || "";
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$type16 = typeMap[_this.type]) === null || _typeMap$_this$type16 === void 0 ? void 0 : _typeMap$_this$type16.idKey], ":").concat(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]) || "");
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$type18;
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$type18 = typeMap[_this.type]) === null || _typeMap$_this$type18 === void 0 ? void 0 : _typeMap$_this$type18.type,
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$type19, _item$templateConfig;
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$type19 = typeMap[_this.type]) === null || _typeMap$_this$type19 === void 0 ? void 0 : _typeMap$_this$type19.code),
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$type20;
254
- return _filterFn.filterSplitComma(_filterFn.filterTableListItemColumnValue(i, item.id, (_typeMap$_this$type20 = typeMap[_this.type]) === null || _typeMap$_this$type20 === void 0 ? void 0 : _typeMap$_this$type20.code), value);
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$type21;
283
- return item[(_typeMap$_this$type21 = typeMap[_this.type]) === null || _typeMap$_this$type21 === void 0 ? void 0 : _typeMap$_this$type21.valueKey];
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$type22;
287
- return Promise.reject(new Error("\u81F3\u5C11\u586B\u5199\u4E00\u4E2A\u5B8C\u6574\u7684".concat((_typeMap$_this$type22 = typeMap[_this.type]) === null || _typeMap$_this$type22 === void 0 ? void 0 : _typeMap$_this$type22.name)));
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;
@@ -113,6 +113,7 @@ function Logistics(options) {
113
113
  name: _this.id,
114
114
  rules: _this.rules,
115
115
  hidden: p === null || p === void 0 ? void 0 : p.hidden,
116
+ display: p === null || p === void 0 ? void 0 : p.display,
116
117
  required: (_this$componentConfig = (_this$componentConfig2 = _this.componentConfig) === null || _this$componentConfig2 === void 0 ? void 0 : _this$componentConfig2.required) !== null && _this$componentConfig !== void 0 ? _this$componentConfig : false,
117
118
  tooltip: (_this$componentConfig3 = _this.componentConfig) !== null && _this$componentConfig3 !== void 0 && _this$componentConfig3.showTooltip ? (_this$componentConfig4 = _this.componentConfig) === null || _this$componentConfig4 === void 0 ? void 0 : _this$componentConfig4.tooltip : "",
118
119
  component: /*#__PURE__*/React.createElement(LogisticsMoreInterception, _extends({}, _this.componentConfig, {
@@ -1,6 +1,6 @@
1
- import { ComponentInterface, PickOption, Record } from '../../type';
2
- import React from 'react';
3
- import './index.less';
1
+ import { ComponentInterface, PickOption, Record } from "../../type";
2
+ import React from "react";
3
+ import "./index.less";
4
4
  declare type Value = {
5
5
  url: string;
6
6
  name: string;
@@ -11,15 +11,22 @@ declare class BasicPicturePro implements ComponentInterface {
11
11
  sortField: string;
12
12
  type: string;
13
13
  rules: any[];
14
- componentConfig: ComponentInterface['componentConfig'];
14
+ componentConfig: ComponentInterface["componentConfig"];
15
15
  isCombinationComponent: boolean;
16
16
  formField: string;
17
17
  canSort: boolean;
18
18
  children: ComponentInterface[];
19
- dataType: ComponentInterface['dataType'];
20
- currenEnv: ComponentInterface['platform'];
19
+ dataType: ComponentInterface["dataType"];
20
+ currenEnv: ComponentInterface["platform"];
21
+ sortChildField: {
22
+ name: string;
23
+ key: string;
24
+ dataType: string;
25
+ [key: string]: any;
26
+ }[];
21
27
  constructor(options: PickOption);
22
28
  formatPictures: (pictures: string) => string[];
29
+ getSortChildFields: () => any;
23
30
  render: (value: Value) => React.JSX.Element | null;
24
31
  renderPc: () => null;
25
32
  renderLog: (r: Record) => React.JSX.Element | null;
@@ -8,17 +8,17 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
8
8
  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; }
9
9
  function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
10
10
  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); }
11
- import React from 'react';
12
- import { ApaasUploadProAsync } from '@kmkf-fe-packages/basic-components';
11
+ import React from "react";
12
+ import { ApaasUploadProAsync } from "@kmkf-fe-packages/basic-components";
13
13
  import GetFormItem from "../GetFormItem";
14
14
  import ItemView from "../../commonComponents/ItemView";
15
15
  import PictureName from "./PictureName";
16
16
  import PictureUrl from "./PictureUrl";
17
- import { isNull } from '@kmkf-fe-packages/kmkf-utils';
17
+ import { isNull } from "@kmkf-fe-packages/kmkf-utils";
18
18
  import "./index.less";
19
- import { Image, Tooltip, message } from 'antd';
20
- import { DownloadOutlined, CopyOutlined } from '@ant-design/icons';
21
- import copy from 'copy-to-clipboard';
19
+ import { Image, Tooltip, message } from "antd";
20
+ import { DownloadOutlined, CopyOutlined } from "@ant-design/icons";
21
+ import copy from "copy-to-clipboard";
22
22
  import { hostUrl } from "../../constant";
23
23
  var BasicPicturePro = /*#__PURE__*/_createClass(function BasicPicturePro(options) {
24
24
  var _this = this,
@@ -36,10 +36,22 @@ var BasicPicturePro = /*#__PURE__*/_createClass(function BasicPicturePro(options
36
36
  _defineProperty(this, "children", void 0);
37
37
  _defineProperty(this, "dataType", void 0);
38
38
  _defineProperty(this, "currenEnv", void 0);
39
+ _defineProperty(this, "sortChildField", void 0);
39
40
  _defineProperty(this, "formatPictures", function (pictures) {
40
- pictures = pictures.replace(/[\[\]]/g, '');
41
- pictures = pictures.replace(/\s/g, '');
42
- return pictures ? pictures.split(',') : [];
41
+ pictures = pictures.replace(/[\[\]]/g, "");
42
+ pictures = pictures.replace(/\s/g, "");
43
+ return pictures ? pictures.split(",") : [];
44
+ });
45
+ _defineProperty(this, "getSortChildFields", function () {
46
+ return [{
47
+ name: "图片名称",
48
+ key: "".concat(_this.id, "_name"),
49
+ dataType: "arrayObject"
50
+ }, {
51
+ name: "图片链接",
52
+ key: "".concat(_this.id, "_url"),
53
+ dataType: "arrayObject"
54
+ }];
43
55
  });
44
56
  _defineProperty(this, "render", function (value) {
45
57
  var _document;
@@ -48,29 +60,29 @@ var BasicPicturePro = /*#__PURE__*/_createClass(function BasicPicturePro(options
48
60
  }
49
61
  var copyText = value.map(function (item) {
50
62
  return item.name;
51
- }).join(',');
63
+ }).join(",");
52
64
  var onCopy = function onCopy() {
53
65
  copy(copyText);
54
- message.success('图片名称复制成功');
66
+ message.success("图片名称复制成功");
55
67
  };
56
68
  return /*#__PURE__*/React.createElement("div", {
57
69
  className: "pictureProClient"
58
70
  }, /*#__PURE__*/React.createElement(Image.PreviewGroup, {
59
- preview: _this.currenEnv === 'ks' ? {
60
- getContainer: (_document = document) === null || _document === void 0 ? void 0 : _document.getElementById('root')
71
+ preview: _this.currenEnv === "ks" ? {
72
+ getContainer: (_document = document) === null || _document === void 0 ? void 0 : _document.getElementById("root")
61
73
  } : true
62
74
  }, value.map(function (item) {
63
75
  var finalImage = "".concat(/^pic\/[\s\S]*$/.test(item.url) ? "".concat(hostUrl, "/").concat(item.url) : item.url, "?x-oss-process=image/resize,h_60,w_60");
64
76
  var showImage = /^pic\/[\s\S]*$/.test(item.url) ? "".concat(hostUrl, "/").concat(item.url) : item.url;
65
77
  var downloadHandle = function downloadHandle() {
66
- if (_this.currenEnv === 'pc') {
78
+ if (_this.currenEnv === "pc") {
67
79
  try {
68
80
  fetch("".concat(hostUrl, "/").concat(item.url)).then(function (res) {
69
81
  return res.blob();
70
82
  }).then(function (blob) {
71
- var a = document.createElement('a');
83
+ var a = document.createElement("a");
72
84
  document.body.appendChild(a);
73
- a.style.display = 'none';
85
+ a.style.display = "none";
74
86
  var url = window.URL.createObjectURL(blob);
75
87
  a.href = url;
76
88
  a.download = item.name;
@@ -83,7 +95,7 @@ var BasicPicturePro = /*#__PURE__*/_createClass(function BasicPicturePro(options
83
95
  }
84
96
  } else {
85
97
  copy("".concat(hostUrl, "/").concat(item.url));
86
- message.success('图片链接复制成功');
98
+ message.success("图片链接复制成功");
87
99
  }
88
100
  };
89
101
  return /*#__PURE__*/React.createElement("div", {
@@ -96,15 +108,15 @@ var BasicPicturePro = /*#__PURE__*/_createClass(function BasicPicturePro(options
96
108
  preview: {
97
109
  src: showImage
98
110
  },
99
- width: '100%',
100
- height: '100%'
111
+ width: "100%",
112
+ height: "100%"
101
113
  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Tooltip, {
102
114
  title: item.name
103
115
  }, /*#__PURE__*/React.createElement("div", {
104
116
  className: "pictureProText"
105
117
  }, item.name)), /*#__PURE__*/React.createElement("div", {
106
118
  className: "pictureProOperate"
107
- }, _this.currenEnv === 'pc' ? /*#__PURE__*/React.createElement(DownloadOutlined, {
119
+ }, _this.currenEnv === "pc" ? /*#__PURE__*/React.createElement(DownloadOutlined, {
108
120
  className: "downloadIcon",
109
121
  onClick: downloadHandle
110
122
  }) : /*#__PURE__*/React.createElement(CopyOutlined, {
@@ -142,9 +154,9 @@ var BasicPicturePro = /*#__PURE__*/_createClass(function BasicPicturePro(options
142
154
  hidden: p === null || p === void 0 ? void 0 : p.hidden,
143
155
  display: p === null || p === void 0 ? void 0 : p.display,
144
156
  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,
145
- 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 : '',
157
+ 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 : "",
146
158
  component: /*#__PURE__*/React.createElement(ApaasUploadProAsync, _extends({}, _this.componentConfig, {
147
- uniqueKey: 'picturePro',
159
+ uniqueKey: "picturePro",
148
160
  hostUrl: hostUrl,
149
161
  platform: _this.currenEnv
150
162
  }))
@@ -166,15 +178,16 @@ var BasicPicturePro = /*#__PURE__*/_createClass(function BasicPicturePro(options
166
178
  this.isCombinationComponent = true;
167
179
  this.canSort = true;
168
180
  this.children = [new PictureName(_objectSpread(_objectSpread({}, options), {}, {
169
- name: '图片名称',
181
+ name: "图片名称",
170
182
  id: "".concat(options.id, "_pictureProList_name"),
171
183
  width: 250
172
184
  })), new PictureUrl(_objectSpread(_objectSpread({}, options), {}, {
173
- name: '图片详情',
185
+ name: "图片详情",
174
186
  id: "".concat(options.id, "_pictureProList_url"),
175
187
  width: 200
176
188
  }))];
177
- this.dataType = 'object';
189
+ this.dataType = "object";
178
190
  this.currenEnv = options === null || options === void 0 ? void 0 : (_options$effects = options.effects) === null || _options$effects === void 0 ? void 0 : _options$effects.env;
191
+ this.sortChildField = this.getSortChildFields();
179
192
  });
180
193
  export default BasicPicturePro;
@@ -16,7 +16,14 @@ declare class PublicGoods implements ComponentInterface {
16
16
  children: ComponentInterface[];
17
17
  dataType: ComponentInterface["dataType"];
18
18
  headers: CommonHeaderGoods;
19
+ sortChildField: {
20
+ name: string;
21
+ key: string;
22
+ dataType: string;
23
+ [key: string]: any;
24
+ }[];
19
25
  constructor(options: PickOption);
26
+ getSortChildFields: () => any;
20
27
  renderClient: (record: any) => React.JSX.Element | null;
21
28
  renderPc: () => null;
22
29
  renderLog: (r: Record) => React.JSX.Element | null;
@@ -15,6 +15,7 @@ import CommonHeaderGoods from "../../CommonHeaderGood";
15
15
  import ItemView from "../../../commonComponents/ItemView";
16
16
  import { isNull } from "@kmkf-fe-packages/kmkf-utils";
17
17
  import { CommonGoods as Goods } from "@kmkf-fe-packages/basic-components";
18
+ import { getColumnsMap } from "../../Common/constants/columnsBaseInfoMap";
18
19
  import { SYMBOL } from "../../../constant";
19
20
  var CONFIG_MAP = {
20
21
  JST_GOODS: {
@@ -60,6 +61,19 @@ var PublicGoods = /*#__PURE__*/_createClass(function PublicGoods(options) {
60
61
  _defineProperty(this, "children", void 0);
61
62
  _defineProperty(this, "dataType", void 0);
62
63
  _defineProperty(this, "headers", void 0);
64
+ _defineProperty(this, "sortChildField", void 0);
65
+ _defineProperty(this, "getSortChildFields", function () {
66
+ var Columns = getColumnsMap();
67
+ return Columns[_this.type].filter(function (item) {
68
+ return !["picUrl"].includes(item.dataIndex);
69
+ }).map(function (item) {
70
+ return {
71
+ name: item.title,
72
+ key: "".concat(_this.id, "_").concat(item.dataIndex),
73
+ dataType: "arrayObject"
74
+ };
75
+ });
76
+ });
63
77
  _defineProperty(this, "renderClient", function (record) {
64
78
  var _record, _CONFIG_MAP$_this$typ, _this$componentConfig;
65
79
  return !isNull(record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ItemView, {
@@ -150,5 +164,6 @@ var PublicGoods = /*#__PURE__*/_createClass(function PublicGoods(options) {
150
164
  }
151
165
  }] : [];
152
166
  this.dataType = "object";
167
+ this.sortChildField = this.getSortChildFields();
153
168
  });
154
169
  export default PublicGoods;
@@ -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) {
@@ -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 | CommonInput | JstSendGood | MsgStatus | PublicGoods | StatusSelect | SubForm | BasicInput | BasicTypeInput | BasicAddress | BasicCascader | BasicCheckbox | BasicDataTime | BasicSelect | BasicSelectOption | BasicRadio | BasicTextArea | BasicPicture | BasicPicturePro | BasicMultSelect | BasicGrade | BasicRate | BasicFile | BasicPosting | CommonDataTime | TradeId | ShopName | BuyerNick | ReceiverName | ReceiverMobile | ReceiverAddress | TradeDateTime | Logistics | ReturnLogistics | ActualPayment | ERemark | AliPay | ItemSelect | ItemId | ItemEnCode | SystemOrderNo | Ordinary | ThirdItemSelect | Payment | ReissueLogistics | JstItemSelect | JstSupply | BsGoods | BsE3Goods | PublicReissueGoods | PublicExchange | BsE3Reissue | BsExchange | BsReissue | BsReturn | FlowStatusSelect | FlowMarkSelect | FlowTag | TemplateSelect | WorkOrderId | LogisticsInterception | LogisticsMoreInterception | LogisticsTrajectory | LogisticsMoreTrajectory | PlatForm | ShopInput | Submitter | PrevSubmitter | FlowCreator | Handler | CompletedUser | FlowWorkOrderId | Calculation | CommonSystemOrder | CommonMultiStatus | NodeDeadLine | HandlerDeadLine | NodeStayDuration | WlnGoods | BsPosting | NodeInput | FlowWorkOrderStatus | WdtGoods | WdtReissue | WdtReturn | WdtExchange | WdtShopSelect | KmVideo | PaymentVoucherCode | Label | MemberLevel | AfterSalesOrderId | GyGoods | GyReissue | GyReturn | AsyncSelect | SkxIdInputSelect | SkxGoods | OrderSubForm | FlowOverallStatusSelect;
3
+ export declare const factory: (type: string, options: PickOption) => BsSystemOrder | CommonMultiStatus | JstSendGood | MsgStatus | BasicPicturePro | PublicGoods | BasicInput | BasicTypeInput | BasicAddress | BasicCascader | BasicCheckbox | BasicDataTime | BasicSelect | BasicSelectOption | BasicRadio | BasicTextArea | BasicPicture | BasicMultSelect | BasicGrade | BasicRate | BasicFile | BasicPosting | SubForm | CommonDataTime | TradeId | ShopName | BuyerNick | ReceiverName | ReceiverMobile | ReceiverAddress | TradeDateTime | Logistics | ReturnLogistics | ActualPayment | ERemark | AliPay | ItemSelect | ItemId | ItemEnCode | SystemOrderNo | Ordinary | ThirdItemSelect | Payment | ReissueLogistics | JstItemSelect | JstSupply | BsGoods | BsE3Goods | PublicReissueGoods | PublicExchange | BsE3Reissue | BsExchange | BsReissue | BsReturn | BsLogistics | FlowStatusSelect | FlowMarkSelect | FlowTag | TemplateSelect | WorkOrderId | LogisticsInterception | LogisticsMoreInterception | LogisticsTrajectory | LogisticsMoreTrajectory | PlatForm | ShopInput | Submitter | PrevSubmitter | FlowCreator | Handler | CompletedUser | FlowWorkOrderId | StatusSelect | Calculation | CommonSystemOrder | NodeDeadLine | HandlerDeadLine | NodeStayDuration | WlnGoods | BsPosting | NodeInput | FlowWorkOrderStatus | WdtGoods | WdtReissue | WdtReturn | WdtExchange | WdtShopSelect | KmVideo | CommonInput | PaymentVoucherCode | Label | MemberLevel | AfterSalesOrderId | GyGoods | GyReissue | GyReturn | AsyncSelect | SkxIdInputSelect | SkxGoods | OrderSubForm | FlowOverallStatusSelect;
@@ -176,6 +176,7 @@ export var factory = function factory(type, options) {
176
176
  case "JST_REISSUE_GOODS":
177
177
  case "KM_REISSUE_GOODS":
178
178
  case "JY_REISSUE_GOODS":
179
+ case "JKY_REISSUE_GOODS":
179
180
  return new PublicReissueGoods(options);
180
181
  case "BS_E3_REISSUE_GOODS":
181
182
  return new BsE3Reissue(options);
@@ -239,6 +240,7 @@ export var factory = function factory(type, options) {
239
240
  case "WAREHOUSING_STATUS":
240
241
  case "BS_E3_WAREHOUSING_STATUS":
241
242
  case "WDT_WAREHOUSING_STATUS":
243
+ case "JKY_WAREHOUSING_STATUS":
242
244
  return new CommonMultiStatus(options);
243
245
  case "MSG_STATUS":
244
246
  return new MsgStatus(options);
@@ -303,6 +303,7 @@ export var queryJYLogisticsCompany = function queryJYLogisticsCompany() {
303
303
  };
304
304
  export var queryJKYLogisticsCompany = function queryJKYLogisticsCompany() {
305
305
  var instance = ExpressData.getInstance("jky");
306
+ console.log("queryJKYLogisticsCompany");
306
307
  return servers.JKY.getLogisticsDataAsync().then(function (data) {
307
308
  instance.expressData = data;
308
309
  }).catch(console.log);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/services-components",
3
- "version": "2.2.44-beta.4",
3
+ "version": "2.2.44-beta.41",
4
4
  "module": "dist/esm/index.js",
5
5
  "typings": "dist/esm/index.d.ts",
6
6
  "files": [
@@ -21,8 +21,8 @@
21
21
  ]
22
22
  },
23
23
  "dependencies": {
24
- "@kmkf-fe-packages/basic-components": "2.2.44-beta.4",
25
- "@kmkf-fe-packages/kmkf-utils": "2.2.44-beta.4",
24
+ "@kmkf-fe-packages/basic-components": "2.2.44-beta.41",
25
+ "@kmkf-fe-packages/kmkf-utils": "2.2.44-beta.41",
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": "6f7a39c27b7121eb64d357d4f346c7168b1febaf",
44
+ "gitHead": "1f3f957279fc8c5801abc588a33e6c9055839d64",
45
45
  "gitHooks": {
46
46
  "pre-commit": "lint-staged"
47
47
  }