@kmkf-fe-packages/services-components 2.10.9-beta.6 → 2.10.9-beta.60

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 (80) hide show
  1. package/dist/esm/Hooks/useColumnsConfig.d.ts +1 -1
  2. package/dist/esm/Hooks/useColumnsConfig.js +1 -1
  3. package/dist/esm/commonComponents/GlobalContext/hook/useGetHasErpData.d.ts +1 -1
  4. package/dist/esm/commonComponents/GlobalContext/hook/useGetHasErpData.js +3 -2
  5. package/dist/esm/commonComponents/GlobalContext/orderQuery/useGetErpLogisticsCompany.js +13 -12
  6. package/dist/esm/commonComponents/GlobalContext/orderQuery/useGetErpSendData.js +12 -9
  7. package/dist/esm/components/BS/BsExchange/index.d.ts +7 -0
  8. package/dist/esm/components/BS/BsExchange/index.js +6 -0
  9. package/dist/esm/components/BS/BsGoods/index.d.ts +7 -0
  10. package/dist/esm/components/BS/BsGoods/index.js +6 -0
  11. package/dist/esm/components/BS/BsLogistics/index.js +9 -0
  12. package/dist/esm/components/BS/BsReissue/index.d.ts +7 -0
  13. package/dist/esm/components/BS/BsReissue/index.js +6 -0
  14. package/dist/esm/components/BS/BsReturn/index.d.ts +7 -0
  15. package/dist/esm/components/BS/BsReturn/index.js +6 -0
  16. package/dist/esm/components/BS/BsSystemOrder/index.js +3 -2
  17. package/dist/esm/components/BS/common/expressCode.js +3 -0
  18. package/dist/esm/components/BS/common/expressCompany.js +3 -0
  19. package/dist/esm/components/BsE3/BsGoods/index.d.ts +7 -0
  20. package/dist/esm/components/BsE3/BsGoods/index.js +6 -0
  21. package/dist/esm/components/BsE3/BsReissueE3/index.d.ts +7 -0
  22. package/dist/esm/components/BsE3/BsReissueE3/index.js +6 -0
  23. package/dist/esm/components/Common/constants/columnsBaseInfoMap.d.ts +6 -0
  24. package/dist/esm/components/Common/constants/columnsBaseInfoMap.js +18 -2
  25. package/dist/esm/components/Common/constants/wdt.js +13 -3
  26. package/dist/esm/components/Common/index.js +21 -6
  27. package/dist/esm/components/CommonHeaderGood/index.js +81 -42
  28. package/dist/esm/components/CommonMultiStatus/index.d.ts +4 -1
  29. package/dist/esm/components/CommonMultiStatus/index.js +123 -6
  30. package/dist/esm/components/GY/GyGoods/index.d.ts +7 -0
  31. package/dist/esm/components/GY/GyGoods/index.js +6 -0
  32. package/dist/esm/components/GY/GyReissue/index.d.ts +7 -0
  33. package/dist/esm/components/GY/GyReissue/index.js +6 -0
  34. package/dist/esm/components/GY/GyReturn/index.d.ts +7 -0
  35. package/dist/esm/components/GY/GyReturn/index.js +6 -0
  36. package/dist/esm/components/JST/JstSendGood/index.d.ts +2 -1
  37. package/dist/esm/components/JST/JstSendGood/index.js +16 -2
  38. package/dist/esm/components/JST/JstSupply/index.d.ts +1 -1
  39. package/dist/esm/components/JST/JstSupply/index.js +3 -0
  40. package/dist/esm/components/KM/KmExchange/index.d.ts +7 -0
  41. package/dist/esm/components/KM/KmExchange/index.js +6 -0
  42. package/dist/esm/components/KmErpSendGood/index.d.ts +1 -1
  43. package/dist/esm/components/KmErpSendGood/index.js +3 -0
  44. package/dist/esm/components/LogisticsInterception/index.d.ts +3 -0
  45. package/dist/esm/components/LogisticsInterception/index.js +14 -7
  46. package/dist/esm/components/LogisticsInterception/interceptLogisticsCustomerCode.d.ts +42 -0
  47. package/dist/esm/components/LogisticsInterception/interceptLogisticsCustomerCode.js +102 -0
  48. package/dist/esm/components/LogisticsMoreInterception/index.d.ts +2 -0
  49. package/dist/esm/components/LogisticsMoreInterception/index.js +19 -5
  50. package/dist/esm/components/LogisticsMoreInterception/interceptLogisticsCustomerCode.d.ts +39 -0
  51. package/dist/esm/components/LogisticsMoreInterception/interceptLogisticsCustomerCode.js +101 -0
  52. package/dist/esm/components/Public/AsyncSelect/index.js +23 -22
  53. package/dist/esm/components/Public/Exchange/index.d.ts +7 -0
  54. package/dist/esm/components/Public/Exchange/index.js +6 -0
  55. package/dist/esm/components/Public/Goods/index.js +6 -12
  56. package/dist/esm/components/Public/ReissueGoods/index.d.ts +7 -0
  57. package/dist/esm/components/Public/ReissueGoods/index.js +6 -0
  58. package/dist/esm/components/Public/ReturnWarehouse/index.d.ts +1 -1
  59. package/dist/esm/components/Public/ReturnWarehouse/index.js +3 -0
  60. package/dist/esm/components/Reissue/Logistics/index.d.ts +1 -1
  61. package/dist/esm/components/Reissue/Logistics/index.js +3 -0
  62. package/dist/esm/components/Remark/index.d.ts +4 -1
  63. package/dist/esm/components/Remark/index.js +46 -9
  64. package/dist/esm/components/SKX/SkxGoods/index.d.ts +7 -0
  65. package/dist/esm/components/SKX/SkxGoods/index.js +6 -0
  66. package/dist/esm/components/WDT/WdtExchange/index.d.ts +7 -0
  67. package/dist/esm/components/WDT/WdtExchange/index.js +6 -0
  68. package/dist/esm/components/WDT/WdtGoods/index.d.ts +7 -0
  69. package/dist/esm/components/WDT/WdtGoods/index.js +6 -0
  70. package/dist/esm/components/WDT/WdtRessuie/index.d.ts +7 -0
  71. package/dist/esm/components/WDT/WdtRessuie/index.js +6 -0
  72. package/dist/esm/components/WDT/WdtReturn/index.d.ts +7 -0
  73. package/dist/esm/components/WDT/WdtReturn/index.js +6 -0
  74. package/dist/esm/constant.js +0 -3
  75. package/dist/esm/factory.d.ts +1 -1
  76. package/dist/esm/factory.js +12 -1
  77. package/dist/esm/service/api.d.ts +1 -0
  78. package/dist/esm/service/api.js +6 -0
  79. package/dist/esm/type.d.ts +1 -0
  80. package/package.json +4 -4
@@ -1,3 +1,9 @@
1
+ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
2
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
3
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
4
+ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
5
+ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
6
+ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
1
7
  import React from "react";
2
8
  import { Image } from "antd";
3
9
  import { CopyTextIcon } from "@kmkf-fe-packages/basic-components";
@@ -169,7 +175,7 @@ var getColumns = function getColumns(_ref) {
169
175
  width: 80
170
176
  }, {
171
177
  dataIndex: "returnPrice",
172
- title: "".concat(text, "\u9000\u8D27\u91D1\u989D"),
178
+ title: "".concat(text, "\u9000\u6B3E\u91D1\u989D"),
173
179
  align: "center",
174
180
  ellipsis: true,
175
181
  width: 100
@@ -315,7 +321,7 @@ var getColumns = function getColumns(_ref) {
315
321
  width: 150
316
322
  }, {
317
323
  dataIndex: "goodsNo",
318
- title: "货品编码",
324
+ title: "货品编号",
319
325
  align: "center",
320
326
  ellipsis: true,
321
327
  width: 150
@@ -406,7 +412,11 @@ var getColumns = function getColumns(_ref) {
406
412
  }]
407
413
  };
408
414
  //旺店通补发商品信息
409
- data["WDT_REISSUE_GOODS"] = data["WDT_GOODS"];
415
+ data["WDT_REISSUE_GOODS"] = data["WDT_GOODS"].map(function (column) {
416
+ return column.dataIndex === "orderPrice" ? _objectSpread(_objectSpread({}, column), {}, {
417
+ title: "补发金额"
418
+ }) : column;
419
+ });
410
420
  return data;
411
421
  };
412
422
  export default getColumns;
@@ -6,6 +6,11 @@ function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableTo
6
6
  function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
7
7
  function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
8
8
  function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
9
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
10
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
11
+ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
12
+ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
13
+ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
9
14
  function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
10
15
  function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
11
16
  function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -21,10 +26,10 @@ import { CopyToClipboard } from "react-copy-to-clipboard";
21
26
  import styles from "./index.module.less";
22
27
  import defaultImg from "./img/default-img.png";
23
28
  import CopyText from "../../commonComponents/CopyText";
24
- import { KM_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, BS_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG, JST_SYSTEM_ORDER_CONFIG, JY_SYSTEM_ORDER_CONFIG, JKY_SYSTEM_ORDER_CONFIG, WDT_RETURN_BILL_NO_CONFIG, PLATFORM_AFTER_SALES_ORDER_CONFIG, DXD_SYSTEM_ORDER_CONFIG, msgTypeCh, getMapping, columnsGoodsList } from "@kmkf-fe-packages/kmkf-utils";
29
+ import { KM_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, BS_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG, JST_SYSTEM_ORDER_CONFIG, JY_SYSTEM_ORDER_CONFIG, JKY_SYSTEM_ORDER_CONFIG, WDT_RETURN_BILL_NO_CONFIG, PLATFORM_AFTER_SALES_ORDER_CONFIG, DXD_SYSTEM_ORDER_CONFIG, TTX_SYSTEM_ORDER_CONFIG, msgTypeCh, getMapping, columnsGoodsList } from "@kmkf-fe-packages/kmkf-utils";
25
30
  import { getColumnsMap } from "./constants/columnsBaseInfoMap";
26
31
  import { VideoCameraTwoTone } from "@ant-design/icons";
27
- import { ApaasImage } from "@kmkf-fe-packages/basic-components";
32
+ import { ApaasImage, resolveColumnWidth } from "@kmkf-fe-packages/basic-components";
28
33
  var Paragraph = Typography.Paragraph;
29
34
  export var getFormItem = function getFormItem(_ref) {
30
35
  var name = _ref.name,
@@ -309,6 +314,7 @@ export var BsExpressRender = function BsExpressRender(_ref7) {
309
314
  var logisticsCompany = item.logisticsCompany,
310
315
  logisticsCompanyName = item.logisticsCompanyName;
311
316
  var company = logisticsCompanyFormType === "input" ? logisticsCompany : ExpressData.getInstance(platformType).getExpressNameByCode(logisticsCompany, false) || logisticsCompanyName || logisticsCompany;
317
+ console.log("00001--", [platformType, logisticsCompany, ExpressData.getInstance(platformType), ExpressData.getInstance(platformType).getExpressNameByCode(logisticsCompany, false) || logisticsCompanyName || logisticsCompany]);
312
318
  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Popover, {
313
319
  content: content(item, index),
314
320
  overlayStyle: {
@@ -505,7 +511,9 @@ export var BsGoodsTable = function BsGoodsTable(_ref11) {
505
511
  });
506
512
  // 如果列应该显示(show不为false)或者有验证器,则返回对应的列配置
507
513
  if (currentCol && (col.show !== false || currentCol !== null && currentCol !== void 0 && currentCol.validator)) {
508
- return currentCol;
514
+ return _objectSpread(_objectSpread({}, currentCol), {}, {
515
+ width: resolveColumnWidth(col.width, currentCol.width)
516
+ });
509
517
  }
510
518
  return undefined;
511
519
  }).filter(Boolean);
@@ -522,6 +530,11 @@ export var BsGoodsTable = function BsGoodsTable(_ref11) {
522
530
  }].concat(_toConsumableArray(baseInfoColumns));
523
531
  return columnList;
524
532
  }, [showHeader, list]);
533
+ var tableScrollX = useMemo(function () {
534
+ return newColumns.reduce(function (total, column) {
535
+ return total + (Number(column.width) || 0);
536
+ }, 0);
537
+ }, [newColumns]);
525
538
  return /*#__PURE__*/React.createElement(Table, {
526
539
  columns: newColumns,
527
540
  dataSource: list,
@@ -529,7 +542,7 @@ export var BsGoodsTable = function BsGoodsTable(_ref11) {
529
542
  size: "small",
530
543
  pagination: false,
531
544
  scroll: {
532
- x: "100%"
545
+ x: tableScrollX
533
546
  },
534
547
  locale: {
535
548
  emptyText: "暂无数据"
@@ -788,7 +801,8 @@ export var BsSystemOrderTable = function BsSystemOrderTable(_ref14) {
788
801
  JKY_SYSTEM_ORDER: JKY_SYSTEM_ORDER_CONFIG.columns,
789
802
  WDT_RETURN_BILL_NO: WDT_RETURN_BILL_NO_CONFIG.columns,
790
803
  PLATFORM_AFTER_SALES_ORDER: PLATFORM_AFTER_SALES_ORDER_CONFIG.columns,
791
- DXD_SYSTEM_ORDER: DXD_SYSTEM_ORDER_CONFIG.columns
804
+ DXD_SYSTEM_ORDER: DXD_SYSTEM_ORDER_CONFIG.columns,
805
+ TTX_SYSTEM_ORDER: TTX_SYSTEM_ORDER_CONFIG.columns
792
806
  };
793
807
  var rowKeyMap = {
794
808
  BS_SYSTEM_ORDER: "billNo",
@@ -802,7 +816,8 @@ export var BsSystemOrderTable = function BsSystemOrderTable(_ref14) {
802
816
  JKY_SYSTEM_ORDER: "tradeNo",
803
817
  WDT_RETURN_BILL_NO: "refundNo",
804
818
  PLATFORM_AFTER_SALES_ORDER: "afterSaleOrderId",
805
- DXD_SYSTEM_ORDER: "orderNo"
819
+ DXD_SYSTEM_ORDER: "orderNo",
820
+ TTX_SYSTEM_ORDER: "code"
806
821
  };
807
822
  var rowSelection = {
808
823
  type: isRadio ? "radio" : "checkbox",
@@ -18,8 +18,12 @@ import ItemView from "../../commonComponents/ItemView";
18
18
  import { isNull, BS_E3_BOOLEAN_STATUS_MAP } from "@kmkf-fe-packages/kmkf-utils";
19
19
  import { BsHeaderPic, BsHeaderChild } from "../BS/common";
20
20
  import ReissueGift from "../BsE3/ReissueGift";
21
- import { erpColumnsMap } from "@kmkf-fe-packages/basic-components";
22
- import { getJstColumns, getKmColumns, getDxdColumns } from "@kmkf-fe-packages/basic-components";
21
+ import { erpColumnsMap, resolveColumnWidth } from "@kmkf-fe-packages/basic-components";
22
+ import { getJstColumns, getKmColumns, getDxdColumns, getTtxColumns } from "@kmkf-fe-packages/basic-components";
23
+ var isNullNotFalse = function isNullNotFalse(val) {
24
+ if (val === false) return false;
25
+ return isNull(val);
26
+ };
23
27
  var orderGoodsHeaderComponentMap = {
24
28
  pic: BsHeaderPic
25
29
  };
@@ -180,7 +184,7 @@ var GoodHeaderMap = {
180
184
  },
181
185
  goodsNo: {
182
186
  component: BsHeaderChild,
183
- name: "货品编码",
187
+ name: "货品编号",
184
188
  key: "goodsNo",
185
189
  width: 150
186
190
  },
@@ -296,7 +300,7 @@ var GoodHeaderMap = {
296
300
  itemKey: {
297
301
  oid: "原始子单号",
298
302
  goodsName: "货品名称",
299
- goodsNo: "货品编码",
303
+ goodsNo: "货品编号",
300
304
  specName: "规格名称",
301
305
  specNo: "商家编码",
302
306
  specCode: "规格编号",
@@ -549,12 +553,19 @@ var GoodHeaderMap = {
549
553
  name: "商品类型",
550
554
  key: "type",
551
555
  width: 100,
552
- render: function render(val) {
556
+ transformValue: function transformValue(val) {
553
557
  var typeMap = {
554
558
  "1": "单品",
555
559
  "2": "组合装"
556
560
  };
557
- return /*#__PURE__*/React.createElement("span", null, typeMap[val]);
561
+ return typeMap[val];
562
+ },
563
+ renderExport: function renderExport(val) {
564
+ var typeMap = {
565
+ "1": "单品",
566
+ "2": "组合装"
567
+ };
568
+ return typeMap[val];
558
569
  }
559
570
  },
560
571
  giftType: {
@@ -1188,19 +1199,19 @@ var GoodHeaderMap = {
1188
1199
  saleBasePrice: {
1189
1200
  name: "原价",
1190
1201
  transformValue: function transformValue(price) {
1191
- return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, '') : "";
1202
+ return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, "") : "";
1192
1203
  },
1193
1204
  renderExport: function renderExport(price) {
1194
- return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, '') : "";
1205
+ return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, "") : "";
1195
1206
  }
1196
1207
  },
1197
1208
  salePrice: {
1198
1209
  name: "单价",
1199
1210
  transformValue: function transformValue(price) {
1200
- return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, '') : "";
1211
+ return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, "") : "";
1201
1212
  },
1202
1213
  renderExport: function renderExport(price) {
1203
- return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, '') : "";
1214
+ return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, "") : "";
1204
1215
  }
1205
1216
  },
1206
1217
  qty: "数量",
@@ -1209,12 +1220,12 @@ var GoodHeaderMap = {
1209
1220
  transformValue: function transformValue(val, record, parentName) {
1210
1221
  if (!record) return "--";
1211
1222
  var amount = (record["".concat(parentName, "_qty")] || 0) * (+record["".concat(parentName, "_salePrice")] || 0);
1212
- return Number(amount).toFixed(4).replace(/\.?0+$/, '');
1223
+ return Number(amount).toFixed(4).replace(/\.?0+$/, "");
1213
1224
  },
1214
1225
  renderExport: function renderExport(val, record, parentName) {
1215
1226
  if (!record) return "--";
1216
1227
  var amount = (record["".concat(parentName, "_qty")] || 0) * (+record["".concat(parentName, "_salePrice")] || 0);
1217
- return Number(amount).toFixed(4).replace(/\.?0+$/, '');
1228
+ return Number(amount).toFixed(4).replace(/\.?0+$/, "");
1218
1229
  }
1219
1230
  },
1220
1231
  batchId: "批次号",
@@ -1260,19 +1271,19 @@ var GoodHeaderMap = {
1260
1271
  saleBasePrice: {
1261
1272
  name: "原价",
1262
1273
  transformValue: function transformValue(price) {
1263
- return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, '') : "";
1274
+ return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, "") : "";
1264
1275
  },
1265
1276
  renderExport: function renderExport(price) {
1266
- return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, '') : "";
1277
+ return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, "") : "";
1267
1278
  }
1268
1279
  },
1269
1280
  salePrice: {
1270
1281
  name: "单价",
1271
1282
  transformValue: function transformValue(price) {
1272
- return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, '') : "";
1283
+ return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, "") : "";
1273
1284
  },
1274
1285
  renderExport: function renderExport(price) {
1275
- return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, '') : "";
1286
+ return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, "") : "";
1276
1287
  }
1277
1288
  },
1278
1289
  qty: "数量",
@@ -1302,19 +1313,19 @@ var GoodHeaderMap = {
1302
1313
  saleBasePrice: {
1303
1314
  name: "原价",
1304
1315
  transformValue: function transformValue(price) {
1305
- return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, '') : "";
1316
+ return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, "") : "";
1306
1317
  },
1307
1318
  renderExport: function renderExport(price) {
1308
- return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, '') : "";
1319
+ return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, "") : "";
1309
1320
  }
1310
1321
  },
1311
1322
  salePrice: {
1312
1323
  name: "单价",
1313
1324
  transformValue: function transformValue(price) {
1314
- return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, '') : "";
1325
+ return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, "") : "";
1315
1326
  },
1316
1327
  renderExport: function renderExport(price) {
1317
- return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, '') : "";
1328
+ return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, "") : "";
1318
1329
  }
1319
1330
  },
1320
1331
  qty: "数量",
@@ -1323,12 +1334,12 @@ var GoodHeaderMap = {
1323
1334
  transformValue: function transformValue(val, record, parentName) {
1324
1335
  if (!record) return "--";
1325
1336
  var amount = (record["".concat(parentName, "_qty")] || 0) * (+record["".concat(parentName, "_salePrice")] || 0);
1326
- return Number(amount).toFixed(4).replace(/\.?0+$/, '');
1337
+ return Number(amount).toFixed(4).replace(/\.?0+$/, "");
1327
1338
  },
1328
1339
  renderExport: function renderExport(val, record, parentName) {
1329
1340
  if (!record) return "--";
1330
1341
  var amount = (record["".concat(parentName, "_qty")] || 0) * (+record["".concat(parentName, "_salePrice")] || 0);
1331
- return Number(amount).toFixed(4).replace(/\.?0+$/, '');
1342
+ return Number(amount).toFixed(4).replace(/\.?0+$/, "");
1332
1343
  }
1333
1344
  },
1334
1345
  batchId: "批次号",
@@ -1359,19 +1370,19 @@ var GoodHeaderMap = {
1359
1370
  saleBasePrice: {
1360
1371
  name: "原价",
1361
1372
  transformValue: function transformValue(price) {
1362
- return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, '') : "";
1373
+ return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, "") : "";
1363
1374
  },
1364
1375
  renderExport: function renderExport(price) {
1365
- return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, '') : "";
1376
+ return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, "") : "";
1366
1377
  }
1367
1378
  },
1368
1379
  salePrice: {
1369
1380
  name: "单价",
1370
1381
  transformValue: function transformValue(price) {
1371
- return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, '') : "";
1382
+ return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, "") : "";
1372
1383
  },
1373
1384
  renderExport: function renderExport(price) {
1374
- return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, '') : "";
1385
+ return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, "") : "";
1375
1386
  }
1376
1387
  },
1377
1388
  qty: "数量",
@@ -1380,12 +1391,12 @@ var GoodHeaderMap = {
1380
1391
  transformValue: function transformValue(val, record, parentName) {
1381
1392
  if (!record) return "--";
1382
1393
  var amount = (record["".concat(parentName, "_qty")] || 0) * (+record["".concat(parentName, "_salePrice")] || 0);
1383
- return Number(amount).toFixed(4).replace(/\.?0+$/, '');
1394
+ return Number(amount).toFixed(4).replace(/\.?0+$/, "");
1384
1395
  },
1385
1396
  renderExport: function renderExport(val, record, parentName) {
1386
1397
  if (!record) return "--";
1387
1398
  var amount = (record["".concat(parentName, "_qty")] || 0) * (+record["".concat(parentName, "_salePrice")] || 0);
1388
- return Number(amount).toFixed(4).replace(/\.?0+$/, '');
1399
+ return Number(amount).toFixed(4).replace(/\.?0+$/, "");
1389
1400
  }
1390
1401
  },
1391
1402
  isGift: {
@@ -1473,11 +1484,11 @@ var GoodHeaderMap = {
1473
1484
  name: "赠品类型",
1474
1485
  width: 100,
1475
1486
  transformValue: function transformValue(val) {
1476
- if (isNull(val)) return "--";
1487
+ if (isNullNotFalse(val)) return "--";
1477
1488
  return val ? "赠品" : "非赠品";
1478
1489
  },
1479
1490
  renderExport: function renderExport(val) {
1480
- if (isNull(val)) return "--";
1491
+ if (isNullNotFalse(val)) return "--";
1481
1492
  return val ? "赠品" : "非赠品";
1482
1493
  }
1483
1494
  },
@@ -1485,11 +1496,11 @@ var GoodHeaderMap = {
1485
1496
  width: 200,
1486
1497
  name: "是否组合商品",
1487
1498
  transformValue: function transformValue(val) {
1488
- if (isNull(val)) return "--";
1499
+ if (isNullNotFalse(val)) return "--";
1489
1500
  return val ? "是" : "否";
1490
1501
  },
1491
1502
  renderExport: function renderExport(val) {
1492
- if (isNull(val)) return "--";
1503
+ if (isNullNotFalse(val)) return "--";
1493
1504
  return val ? "是" : "否";
1494
1505
  }
1495
1506
  },
@@ -1497,11 +1508,11 @@ var GoodHeaderMap = {
1497
1508
  width: 100,
1498
1509
  name: "是否退款",
1499
1510
  transformValue: function transformValue(val) {
1500
- if (isNull(val)) return "--";
1511
+ if (isNullNotFalse(val)) return "--";
1501
1512
  return val ? "是" : "否";
1502
1513
  },
1503
1514
  renderExport: function renderExport(val) {
1504
- if (isNull(val)) return "--";
1515
+ if (isNullNotFalse(val)) return "--";
1505
1516
  return val ? "是" : "否";
1506
1517
  }
1507
1518
  },
@@ -1587,11 +1598,11 @@ var GoodHeaderMap = {
1587
1598
  name: "赠品类型",
1588
1599
  width: 100,
1589
1600
  transformValue: function transformValue(val) {
1590
- if (isNull(val)) return "--";
1601
+ if (isNullNotFalse(val)) return "--";
1591
1602
  return val ? "赠品" : "非赠品";
1592
1603
  },
1593
1604
  renderExport: function renderExport(val) {
1594
- if (isNull(val)) return "--";
1605
+ if (isNullNotFalse(val)) return "--";
1595
1606
  return val ? "赠品" : "非赠品";
1596
1607
  }
1597
1608
  },
@@ -1599,11 +1610,11 @@ var GoodHeaderMap = {
1599
1610
  width: 200,
1600
1611
  name: "是否组合商品",
1601
1612
  transformValue: function transformValue(val) {
1602
- if (isNull(val)) return "--";
1613
+ if (isNullNotFalse(val)) return "--";
1603
1614
  return val ? "是" : "否";
1604
1615
  },
1605
1616
  renderExport: function renderExport(val) {
1606
- if (isNull(val)) return "--";
1617
+ if (isNullNotFalse(val)) return "--";
1607
1618
  return val ? "是" : "否";
1608
1619
  }
1609
1620
  },
@@ -1611,11 +1622,11 @@ var GoodHeaderMap = {
1611
1622
  width: 100,
1612
1623
  name: "是否退款",
1613
1624
  transformValue: function transformValue(val) {
1614
- if (isNull(val)) return "--";
1625
+ if (isNullNotFalse(val)) return "--";
1615
1626
  return val ? "是" : "否";
1616
1627
  },
1617
1628
  renderExport: function renderExport(val) {
1618
- if (isNull(val)) return "--";
1629
+ if (isNullNotFalse(val)) return "--";
1619
1630
  return val ? "是" : "否";
1620
1631
  }
1621
1632
  },
@@ -2594,6 +2605,21 @@ var GoodHeaderMap = {
2594
2605
  return acc;
2595
2606
  }, {})
2596
2607
  },
2608
+ TTX_GOODS: {
2609
+ headerMap: getTtxColumns()["TTX_GOODS"].reduce(function (acc, item) {
2610
+ acc[item.dataIndex] = _objectSpread(_objectSpread({}, item.headerMapping || {}), {}, {
2611
+ component: orderGoodsHeaderComponentMap[item.headerComponentType] || BsHeaderChild,
2612
+ name: item.title,
2613
+ key: item.dataIndex,
2614
+ width: item.width || 150
2615
+ });
2616
+ return acc;
2617
+ }, {}),
2618
+ itemKey: getTtxColumns()["TTX_GOODS"].reduce(function (acc, item) {
2619
+ acc[item.dataIndex] = item.title;
2620
+ return acc;
2621
+ }, {})
2622
+ },
2597
2623
  JKY_REISSUE_GOODS: {
2598
2624
  headerMap: {
2599
2625
  goodsNo: {
@@ -2723,7 +2749,16 @@ var GoodHeaderMap = {
2723
2749
  moneyKey: "sellTotal"
2724
2750
  }
2725
2751
  };
2726
- GoodHeaderMap["WDT_REISSUE_GOODS"] = GoodHeaderMap["WDT_GOODS"];
2752
+ GoodHeaderMap["WDT_REISSUE_GOODS"] = _objectSpread(_objectSpread({}, GoodHeaderMap["WDT_GOODS"]), {}, {
2753
+ headerMap: _objectSpread(_objectSpread({}, GoodHeaderMap["WDT_GOODS"].headerMap), {}, {
2754
+ orderPrice: _objectSpread(_objectSpread({}, GoodHeaderMap["WDT_GOODS"].headerMap.orderPrice), {}, {
2755
+ name: "补发金额"
2756
+ })
2757
+ }),
2758
+ itemKey: _objectSpread(_objectSpread({}, GoodHeaderMap["WDT_GOODS"].itemKey), {}, {
2759
+ orderPrice: "补发金额"
2760
+ })
2761
+ });
2727
2762
  var CommonHeaderGoods = /*#__PURE__*/function () {
2728
2763
  function CommonHeaderGoods(options) {
2729
2764
  var _this = this,
@@ -2837,11 +2872,15 @@ var CommonHeaderGoods = /*#__PURE__*/function () {
2837
2872
  var _this2$itemKey;
2838
2873
  var headerConfig = GoodHeaderMap[_this2.type].headerMap[key];
2839
2874
  var isStringConfig = typeof headerConfig === "string";
2875
+ var configuredColumn = isObjectArray ? showHeader.find(function (item) {
2876
+ return item.dataIndex === key;
2877
+ }) : undefined;
2878
+ var defaultWidth = isStringConfig ? 80 : headerConfig.width || 80;
2840
2879
  return {
2841
2880
  component: isStringConfig ? BsHeaderChild : headerConfig.component || BsHeaderChild,
2842
2881
  name: isStringConfig ? headerConfig : ((_this2$itemKey = _this2.itemKey) === null || _this2$itemKey === void 0 ? void 0 : _this2$itemKey[key]) || headerConfig.name,
2843
2882
  key: isStringConfig ? key : headerConfig.key || key,
2844
- width: isStringConfig ? 80 : headerConfig.width || 80,
2883
+ width: resolveColumnWidth(configuredColumn === null || configuredColumn === void 0 ? void 0 : configuredColumn.width, defaultWidth),
2845
2884
  transformValue: isStringConfig ? undefined : headerConfig.transformValue,
2846
2885
  renderExport: isStringConfig ? undefined : headerConfig.renderExport
2847
2886
  };
@@ -14,7 +14,10 @@ declare class CommonMultiStatus implements ComponentInterface {
14
14
  children: ComponentInterface[];
15
15
  dataType: ComponentInterface["dataType"];
16
16
  isSingleValue: boolean;
17
- constructor(options: PickOption);
17
+ ext?: {
18
+ [key: string]: any;
19
+ };
20
+ constructor(options: PickOption, ext?: {});
18
21
  renderClient: (record: any) => React.JSX.Element | null;
19
22
  renderPc: (value: any, record: Record) => React.JSX.Element;
20
23
  renderLog: (r: Record) => React.JSX.Element | null;