@kmkf-fe-packages/basic-components 1.22.1-beta.9 → 1.22.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.esm.js CHANGED
@@ -3,8 +3,8 @@ import { Cascader, DatePicker, InputNumber, Input, Select, Upload, Image, messag
3
3
  import { EyeOutlined, DeleteOutlined, CloseCircleOutlined, CaretUpOutlined } from '@ant-design/icons';
4
4
  import request, { extend as extend$1 } from 'umi-request';
5
5
  import { CopyToClipboard } from 'react-copy-to-clipboard';
6
- import { AddressData, BsAddressData, WdtAddressData, request as request$1, ExpressData, uuid, LogisticsAddressData, SendDataCenter, BS_E3_BOOLEAN_STATUS_MAP, filterWdtOrders, WDT_ORDER_TYPE_MAP, filterBsE3Orders, filterKmOrders, KM_SYSTEM_ORDER_CONFIG, BS_E3_ORDER_STATUS_MAP, updateWdtGoodsHandle, updateBsE3GoodsHandle } from '@kmkf-fe-packages/kmkf-utils';
7
- import { debounce, isNaN as isNaN$1, isNumber as isNumber$1, cloneDeep, difference, differenceWith, takeRight, reject, isEmpty, intersection } from 'lodash';
6
+ import { AddressData, BsAddressData, WdtAddressData, request as request$1, ExpressData, uuid, LogisticsAddressData, SendDataCenter, BS_E3_BOOLEAN_STATUS_MAP, filterWdtOrders, WDT_ORDER_TYPE_MAP, filterBsE3Orders, BS_E3_ORDER_STATUS_MAP, updateWdtGoodsHandle, updateBsE3GoodsHandle } from '@kmkf-fe-packages/kmkf-utils';
7
+ import { debounce, isNaN as isNaN$1, isNumber as isNumber$1, cloneDeep, difference, differenceWith, takeRight, reject, isEmpty } from 'lodash';
8
8
  import { useUpdateEffect, useDebounceEffect, useAntdTable } from 'ahooks';
9
9
  import zhCN from 'antd/lib/locale/zh_CN';
10
10
  import pubsub from 'pubsub-js';
@@ -10956,7 +10956,6 @@ var jstGoods = function jstGoods(props) {
10956
10956
  changeIndex = _useState2[0],
10957
10957
  setChangeIndex = _useState2[1]; //选中的包裹
10958
10958
  var sendOptions = SendDataCenter.getInstance(platformType).getSendData();
10959
- var isSelectName = ['wdt', 'bsE3', 'km'].includes(platformType);
10960
10959
  useEffect(function () {
10961
10960
  //没有值塞个默认值
10962
10961
  if (!(value === null || value === void 0 ? void 0 : value.length) && type !== 1) {
@@ -10987,7 +10986,7 @@ var jstGoods = function jstGoods(props) {
10987
10986
  var changeOrderInfo = _objectSpread2({}, value[changeIndex]);
10988
10987
  changeOrderInfo[type] = val;
10989
10988
  changeOrderInfo['sendId'] = option.value;
10990
- if (isSelectName && type === 'sendName') {
10989
+ if ((platformType === 'wdt' || platformType === 'bsE3') && type === 'sendName') {
10991
10990
  changeOrderInfo['sendSnapshotName'] = option.label;
10992
10991
  }
10993
10992
  var newList = _toConsumableArray(value);
@@ -11070,7 +11069,7 @@ var jstGoods = function jstGoods(props) {
11070
11069
  return changeInputHandle(e.target.value, 'sendId');
11071
11070
  },
11072
11071
  value: (_value$changeIndex5 = value[changeIndex]) === null || _value$changeIndex5 === void 0 ? void 0 : _value$changeIndex5.sendId
11073
- }), ['sendName', 'all'].includes(showField) && (isSelectName ? /*#__PURE__*/React.createElement(Select, {
11072
+ }), ['sendName', 'all'].includes(showField) && (platformType === 'wdt' || platformType === 'bsE3' ? /*#__PURE__*/React.createElement(Select, {
11074
11073
  style: {
11075
11074
  minWidth: '100px',
11076
11075
  maxWidth: '180px'
@@ -12576,104 +12575,6 @@ var getBsE3ReissueGoodColumns = function getBsE3ReissueGoodColumns(_ref4) {
12576
12575
  });
12577
12576
  };
12578
12577
 
12579
- var columns$4 = [{
12580
- dataIndex: 'goodId',
12581
- title: "\u5546\u54C1ID",
12582
- width: 70
12583
- }, {
12584
- dataIndex: 'goodNo',
12585
- title: "\u5546\u54C1\u7F16\u7801",
12586
- width: 180
12587
- }, {
12588
- dataIndex: 'goodName',
12589
- title: "\u5546\u54C1\u540D\u79F0",
12590
- width: 250
12591
- }, {
12592
- dataIndex: 'specId',
12593
- title: "SKUID",
12594
- width: 100
12595
- }, {
12596
- dataIndex: 'specNo',
12597
- title: "\u5546\u54C1SKU\u7F16\u7801",
12598
- width: 180
12599
- }, {
12600
- dataIndex: 'specName',
12601
- title: "\u5546\u54C1SKU\u540D\u79F0",
12602
- width: 250
12603
- }, {
12604
- dataIndex: 'orderPrice',
12605
- title: "\u5B9E\u4ED8\u603B\u91D1\u989D",
12606
- width: 100
12607
- }, {
12608
- dataIndex: 'num',
12609
- title: "\u6570\u91CF",
12610
- width: 100
12611
- }, {
12612
- dataIndex: 'sharePrice',
12613
- title: "\u5206\u644A\u4EF7",
12614
- width: 70
12615
- }, {
12616
- dataIndex: 'giftType',
12617
- title: "\u8D60\u54C1\u65B9\u5F0F",
12618
- width: 100
12619
- }];
12620
- var renderFieldMap$1 = {
12621
- num: function num(_ref) {
12622
- var disabled = _ref.disabled,
12623
- updateHandle = _ref.updateHandle;
12624
- return function (val, record, index) {
12625
- return !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
12626
- style: {
12627
- width: 70
12628
- },
12629
- value: val,
12630
- min: 1,
12631
- precision: 0,
12632
- onChange: function onChange(num) {
12633
- return updateHandle(num, index, 'num');
12634
- }
12635
- }) : /*#__PURE__*/React.createElement("span", null, val);
12636
- };
12637
- },
12638
- giftType: function giftType(_ref2) {
12639
- var disabled = _ref2.disabled,
12640
- updateHandle = _ref2.updateHandle;
12641
- return function (val) {
12642
- var giftTypeMap = {
12643
- 0: '非赠品',
12644
- 1: '自动赠送',
12645
- 2: '手工赠送',
12646
- 3: '回购自动送赠品',
12647
- 4: '前N有礼送赠品',
12648
- 6: '天猫优仓赠品',
12649
- 7: '淘宝CRM会员送赠'
12650
- };
12651
- return /*#__PURE__*/React.createElement("span", null, giftTypeMap[val]);
12652
- };
12653
- }
12654
- };
12655
- var getWdtReissueGoodColumns = function getWdtReissueGoodColumns(_ref3) {
12656
- var disabled = _ref3.disabled,
12657
- updateHandle = _ref3.updateHandle,
12658
- operate = _ref3.operate;
12659
- return columns$4.map(function (item) {
12660
- var newItem = _objectSpread2({
12661
- align: 'center',
12662
- ellipsis: true
12663
- }, item);
12664
- if (operate && (renderFieldMap$1 === null || renderFieldMap$1 === void 0 ? void 0 : renderFieldMap$1[item.dataIndex])) {
12665
- return _objectSpread2(_objectSpread2({}, newItem), {}, {
12666
- render: renderFieldMap$1 === null || renderFieldMap$1 === void 0 ? void 0 : renderFieldMap$1[item.dataIndex]({
12667
- disabled: disabled,
12668
- updateHandle: updateHandle
12669
- })
12670
- });
12671
- }
12672
- return newItem;
12673
- });
12674
- };
12675
-
12676
- var MAIN_FIELD = 'id';
12677
12578
  var SelectTradeGoods = function SelectTradeGoods(_ref) {
12678
12579
  var columns = _ref.columns,
12679
12580
  dataSource = _ref.dataSource,
@@ -12689,20 +12590,11 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
12689
12590
  var closeModal = function closeModal() {
12690
12591
  return setTradeGoodsVisible(false);
12691
12592
  };
12692
- var currentTradeOriginGoods = intersection(dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (item) {
12693
- return item === null || item === void 0 ? void 0 : item[MAIN_FIELD];
12694
- }), selectedRowKeys);
12695
- var unCurrentTradeOriginGoods = difference(selectedRowKeys, dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (item) {
12696
- return item === null || item === void 0 ? void 0 : item[MAIN_FIELD];
12697
- }));
12698
- var handleChangeSelectedKeys = function handleChangeSelectedKeys(keys) {
12699
- console.log('handleChangeSelectedKeys', keys, unCurrentTradeOriginGoods);
12700
- onChangeSelectedKeys(keys.concat(unCurrentTradeOriginGoods));
12701
- };
12702
12593
  var rowSelection = {
12703
12594
  selectedRowKeys: selectedRowKeys,
12704
- onChange: handleChangeSelectedKeys
12595
+ onChange: onChangeSelectedKeys
12705
12596
  };
12597
+ console.debug('选择订单商品-dataSource', dataSource, selectedRowKeys);
12706
12598
  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Button, {
12707
12599
  type: "link",
12708
12600
  onClick: openModal
@@ -12712,7 +12604,7 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
12712
12604
  footer: null,
12713
12605
  onCancel: closeModal
12714
12606
  }, /*#__PURE__*/React.createElement(Table, {
12715
- rowKey: MAIN_FIELD,
12607
+ rowKey: "id",
12716
12608
  rowSelection: rowSelection,
12717
12609
  columns: columns,
12718
12610
  dataSource: dataSource,
@@ -12721,17 +12613,7 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
12721
12613
  x: 500,
12722
12614
  y: 500
12723
12615
  }
12724
- }), /*#__PURE__*/React.createElement("span", null, "\u5DF2\u9009\u62E9(", currentTradeOriginGoods === null || currentTradeOriginGoods === void 0 ? void 0 : currentTradeOriginGoods.length, "/", dataSource === null || dataSource === void 0 ? void 0 : dataSource.length, ")")));
12725
- };
12726
- var getButtonText = function getButtonText() {
12727
- var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
12728
- if (['BS_E3_GOODS', 'BS_E3_REISSUE_GOODS', 'BS_E3_EXCHANGE_GOODS'].includes(type)) {
12729
- return '选择百胜ERP商品';
12730
- }
12731
- if (['WDT_REISSUE_GOODS'].includes(type)) {
12732
- return '选择旺店通商品';
12733
- }
12734
- return '选择商品';
12616
+ }), /*#__PURE__*/React.createElement("span", null, "\u5DF2\u9009\u62E9(", selectedRowKeys === null || selectedRowKeys === void 0 ? void 0 : selectedRowKeys.length, "/", dataSource === null || dataSource === void 0 ? void 0 : dataSource.length, ")")));
12735
12617
  };
12736
12618
  var GoodItem$1 = function GoodItem(props) {
12737
12619
  var _props$value = props.value,
@@ -12788,7 +12670,7 @@ var GoodItem$1 = function GoodItem(props) {
12788
12670
  // TODO: 商品订单中以选中商品
12789
12671
  var selectedGoods = useMemo(function () {
12790
12672
  return value === null || value === void 0 ? void 0 : value.map(function (v) {
12791
- return v === null || v === void 0 ? void 0 : v[MAIN_FIELD];
12673
+ return v.id;
12792
12674
  });
12793
12675
  }, [value]);
12794
12676
  var updateHandle = function updateHandle(val, index, columnType) {
@@ -12829,14 +12711,6 @@ var GoodItem$1 = function GoodItem(props) {
12829
12711
  var columns = [];
12830
12712
  switch (type) {
12831
12713
  case 'WDT_REISSUE_GOODS':
12832
- {
12833
- columns = getWdtReissueGoodColumns({
12834
- disabled: disabled,
12835
- updateHandle: updateHandle,
12836
- operate: operate
12837
- });
12838
- }
12839
- break;
12840
12714
  case 'WDT_GOODS':
12841
12715
  columns = [{
12842
12716
  dataIndex: 'goodId',
@@ -13342,116 +13216,6 @@ var GoodItem$1 = function GoodItem(props) {
13342
13216
  });
13343
13217
  }
13344
13218
  break;
13345
- case 'BS_GOODS':
13346
- columns = [{
13347
- dataIndex: 'mark',
13348
- title: "\u5546\u54C1\u6807\u8BB0",
13349
- align: 'center',
13350
- ellipsis: true,
13351
- width: 70,
13352
- render: function render(val, record, index) {
13353
- return /*#__PURE__*/React.createElement(Select, {
13354
- options: [{
13355
- label: '是',
13356
- value: '是'
13357
- }, {
13358
- label: '否',
13359
- value: '否'
13360
- }],
13361
- disabled: disabled,
13362
- value: val,
13363
- onChange: function onChange(val) {
13364
- return updateHandle(val, index, 'mark');
13365
- }
13366
- });
13367
- }
13368
- }, {
13369
- dataIndex: 'skuName',
13370
- title: "".concat(text, "sku\u540D\u79F0"),
13371
- align: 'center',
13372
- ellipsis: true,
13373
- width: 250
13374
- }, {
13375
- dataIndex: 'sku',
13376
- title: "".concat(text, "sku\u7F16\u7801"),
13377
- align: 'center',
13378
- ellipsis: true,
13379
- width: 100
13380
- }, {
13381
- dataIndex: 'name',
13382
- title: "".concat(text, "\u540D\u79F0"),
13383
- align: 'center',
13384
- ellipsis: true,
13385
- width: 250
13386
- }, {
13387
- dataIndex: 'pic',
13388
- title: "\u56FE\u7247",
13389
- align: 'center',
13390
- ellipsis: true,
13391
- width: 100,
13392
- render: function render(val) {
13393
- return /*#__PURE__*/React.createElement(Image, {
13394
- width: 60,
13395
- src: val
13396
- });
13397
- }
13398
- }, {
13399
- dataIndex: 'code',
13400
- title: "".concat(text, "\u7F16\u7801"),
13401
- align: 'center',
13402
- ellipsis: true,
13403
- width: 100
13404
- }, {
13405
- dataIndex: 'money',
13406
- title: "\u5B9E\u4ED8\u91D1\u989D",
13407
- align: 'center',
13408
- ellipsis: true,
13409
- width: 100
13410
- }, {
13411
- dataIndex: 'number',
13412
- title: "".concat(text, "\u6570\u91CF"),
13413
- align: 'center',
13414
- ellipsis: true,
13415
- width: 100,
13416
- render: function render(val, record, index) {
13417
- return record.canUpdateNumber && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
13418
- style: {
13419
- width: 70
13420
- },
13421
- value: val,
13422
- min: 1,
13423
- precision: 0,
13424
- onChange: function onChange(num) {
13425
- return updateHandle(num, index, 'number');
13426
- }
13427
- }) : /*#__PURE__*/React.createElement("span", null, val);
13428
- }
13429
- }, {
13430
- dataIndex: 'share',
13431
- title: "\u5206\u644A\u4EF7",
13432
- align: 'center',
13433
- ellipsis: true,
13434
- width: 70
13435
- }, {
13436
- dataIndex: 'type',
13437
- title: "\u8D60\u54C1\u7C7B\u578B",
13438
- align: 'center',
13439
- ellipsis: true,
13440
- width: 100
13441
- }, {
13442
- dataIndex: 'batch',
13443
- title: "\u6279\u6B21\u53F7",
13444
- align: 'center',
13445
- ellipsis: true,
13446
- width: 100
13447
- }, {
13448
- dataIndex: 'expireDate',
13449
- title: "\u6709\u6548\u671F",
13450
- align: 'center',
13451
- ellipsis: true,
13452
- width: 100
13453
- }];
13454
- break;
13455
13219
  default:
13456
13220
  columns = [{
13457
13221
  dataIndex: 'mark',
@@ -13720,7 +13484,7 @@ var GoodItem$1 = function GoodItem(props) {
13720
13484
  }), /*#__PURE__*/React.createElement(Button, {
13721
13485
  type: "link",
13722
13486
  onClick: handleChangeGoods
13723
- }, getButtonText(type)), otherOperations), /*#__PURE__*/React.createElement(Table, _objectSpread2(_objectSpread2({}, tableConfig), {}, {
13487
+ }, ['BS_E3_GOODS', 'BS_E3_REISSUE_GOODS', 'BS_E3_EXCHANGE_GOODS'].includes(type) ? '选择百胜ERP商品' : '选择商品'), otherOperations), /*#__PURE__*/React.createElement(Table, _objectSpread2(_objectSpread2({}, tableConfig), {}, {
13724
13488
  columns: newColumns,
13725
13489
  dataSource: value,
13726
13490
  rowKey: 'uuid',
@@ -14445,53 +14209,6 @@ var bsE3Utils = {
14445
14209
  getBsE3OrderListSingleton: getBsE3OrderListSingleton
14446
14210
  };
14447
14211
 
14448
- var singletonMap$2 = new Map();
14449
- var getOrderListSingleton = function getOrderListSingleton(orderNo) {
14450
- if (!singletonMap$2.has(orderNo)) {
14451
- var p = new Promise(function (resolve, reject) {
14452
- var doReject = function doReject(err) {
14453
- // 清空掉错误的请求记录
14454
- singletonMap$2.delete(orderNo);
14455
- reject(err);
14456
- };
14457
- extendRequest('/qy/gdfw/order/kmErpOrderDetail', {
14458
- method: 'post',
14459
- data: {
14460
- tid: orderNo
14461
- }
14462
- }).then(function (data) {
14463
- if (data === null || data === void 0 ? void 0 : data.success) {
14464
- var _data$data, _data$data$orderDetai;
14465
- if (data === null || data === void 0 ? void 0 : (_data$data = data.data) === null || _data$data === void 0 ? void 0 : (_data$data$orderDetai = _data$data.orderDetailDtoList) === null || _data$data$orderDetai === void 0 ? void 0 : _data$data$orderDetai.length) {
14466
- var list = filterKmOrders(data === null || data === void 0 ? void 0 : data.data, orderNo).map(function (item) {
14467
- return _objectSpread2(_objectSpread2({}, item), {}, {
14468
- billNo: item.sid,
14469
- sysStatus: item.sysStatus,
14470
- billType: item.type,
14471
- billTag: item.tags
14472
- });
14473
- });
14474
- resolve(list);
14475
- } else {
14476
- resolve([]);
14477
- }
14478
- // 延迟10秒清除,保证订单的时效性
14479
- setTimeout(function () {
14480
- singletonMap$2.delete(orderNo);
14481
- }, 1000 * 10);
14482
- } else {
14483
- doReject(data);
14484
- }
14485
- }).catch(doReject);
14486
- });
14487
- singletonMap$2.set(orderNo, p);
14488
- }
14489
- return singletonMap$2.get(orderNo);
14490
- };
14491
- var kmUtils = {
14492
- getOrderListSingleton: getOrderListSingleton
14493
- };
14494
-
14495
14212
  var columnsMap = {
14496
14213
  BS_SYSTEM_ORDER: [{
14497
14214
  title: '单据类型',
@@ -14521,7 +14238,6 @@ var columnsMap = {
14521
14238
  // },
14522
14239
  ],
14523
14240
 
14524
- KM_SYSTEM_ORDER: KM_SYSTEM_ORDER_CONFIG.columns,
14525
14241
  WLN_SYSTEM_ORDER: [{
14526
14242
  title: '订单类型',
14527
14243
  dataIndex: 'billType',
@@ -14618,7 +14334,6 @@ var columnsMap = {
14618
14334
  };
14619
14335
  var rowKeyMap = {
14620
14336
  BS_SYSTEM_ORDER: 'billNo',
14621
- KM_SYSTEM_ORDER: 'billNo',
14622
14337
  WLN_SYSTEM_ORDER: 'billNo',
14623
14338
  WDT_SYSTEM_ORDER: 'billNo',
14624
14339
  BS_E3_SYSTEM_ORDER: 'orderSn'
@@ -14635,8 +14350,6 @@ var index$1 = (function (props) {
14635
14350
  onceRef.current = true;
14636
14351
  if (type === 'BS_SYSTEM_ORDER') {
14637
14352
  getOrderList(value.orderNo);
14638
- } else if (type === 'KM_SYSTEM_ORDER') {
14639
- getKmOrderList(value.orderNo);
14640
14353
  } else if (type === 'WLN_SYSTEM_ORDER') {
14641
14354
  getWlnOrderList(value.orderNo);
14642
14355
  } else if (type === 'WDT_SYSTEM_ORDER') {
@@ -14798,37 +14511,6 @@ var index$1 = (function (props) {
14798
14511
  return _ref5.apply(this, arguments);
14799
14512
  };
14800
14513
  }();
14801
- var getKmOrderList = /*#__PURE__*/function () {
14802
- var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(orderNo) {
14803
- return _regeneratorRuntime().wrap(function _callee5$(_context5) {
14804
- while (1) switch (_context5.prev = _context5.next) {
14805
- case 0:
14806
- kmUtils.getOrderListSingleton(orderNo).then(function (trades) {
14807
- _onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, value), {}, {
14808
- orders: trades,
14809
- showOrderInfo: trades.map(function (_ref7) {
14810
- var billNo = _ref7.billNo,
14811
- billType = _ref7.billType,
14812
- billTag = _ref7.billTag;
14813
- return {
14814
- billNo: billNo,
14815
- billType: billType,
14816
- billTag: billTag
14817
- };
14818
- })
14819
- }));
14820
- });
14821
- onceRef.current = false;
14822
- case 2:
14823
- case "end":
14824
- return _context5.stop();
14825
- }
14826
- }, _callee5);
14827
- }));
14828
- return function getKmOrderList(_x5) {
14829
- return _ref6.apply(this, arguments);
14830
- };
14831
- }();
14832
14514
  var rowSelection = {
14833
14515
  selectedRowKeys: (value === null || value === void 0 ? void 0 : value.selectIds) || [],
14834
14516
  fixed: true,
@@ -15399,7 +15081,7 @@ var typeMap$1 = {
15399
15081
  }
15400
15082
  };
15401
15083
  var wdtReissue = function wdtReissue(props) {
15402
- var _value$wdtSystemOrder, _typeMap$type25, _typeMap$type27, _typeMap$type28, _value$typeMap$type$s5, _typeMap$type29, _typeMap$type30, _typeMap$type31;
15084
+ var _value$wdtSystemOrder, _typeMap$type24, _typeMap$type25, _value$typeMap$type$s5, _typeMap$type26, _typeMap$type27, _typeMap$type28;
15403
15085
  var value = props.value,
15404
15086
  onChange = props.onChange,
15405
15087
  _props$reasonList = props.reasonList,
@@ -15559,20 +15241,11 @@ var wdtReissue = function wdtReissue(props) {
15559
15241
  }
15560
15242
  onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
15561
15243
  };
15562
- var selectedGoodsChange = useCallback(function (skuList) {
15563
- var _typeMap$type23, _value, _typeMap$type24;
15564
- var newValue = _objectSpread2({}, value);
15565
- newValue["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type23 = typeMap$1[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.key)] = value === null || value === void 0 ? void 0 : (_value = value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type24 = typeMap$1[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.key)]) === null || _value === void 0 ? void 0 : _value.filter(function (item) {
15566
- return skuList.includes(item.id);
15567
- });
15568
- console.log('newValue', newValue);
15569
- onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
15570
- }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type25 = typeMap$1[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.key)]]);
15571
15244
  //显示选择商品按钮 原单换不显示选择商品
15572
15245
  var showChangeBtn = useMemo(function () {
15573
- var _typeMap$type26;
15574
- return !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type26 = typeMap$1[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.systemOrderNo]);
15575
- }, [value === null || value === void 0 ? void 0 : value[(_typeMap$type27 = typeMap$1[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.systemOrderNo]]);
15246
+ var _typeMap$type23;
15247
+ return !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type23 = typeMap$1[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.systemOrderNo]);
15248
+ }, [value === null || value === void 0 ? void 0 : value[(_typeMap$type24 = typeMap$1[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.systemOrderNo]]);
15576
15249
  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Row, {
15577
15250
  gutter: 8,
15578
15251
  wrap: true
@@ -15590,12 +15263,12 @@ var wdtReissue = function wdtReissue(props) {
15590
15263
  },
15591
15264
  disabled: disabled,
15592
15265
  allowClear: false,
15593
- value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type28 = typeMap$1[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.systemOrderNo)],
15266
+ value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type25 = typeMap$1[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.systemOrderNo)],
15594
15267
  onChange: function onChange(val) {
15595
15268
  return changeSystemOrderHandle(val);
15596
15269
  },
15597
15270
  placeholder: "\u9009\u62E9\u8865\u53D1\u7CFB\u7EDF\u5355"
15598
- }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s5 = value[(_typeMap$type29 = typeMap$1[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.systemOrder]) === null || _value$typeMap$type$s5 === void 0 ? void 0 : _value$typeMap$type$s5.showOrderInfo) || []).map(function (item) {
15271
+ }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s5 = value[(_typeMap$type26 = typeMap$1[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.systemOrder]) === null || _value$typeMap$type$s5 === void 0 ? void 0 : _value$typeMap$type$s5.showOrderInfo) || []).map(function (item) {
15599
15272
  return /*#__PURE__*/React.createElement(Select.Option, {
15600
15273
  key: item.billNo,
15601
15274
  value: item.billNo,
@@ -15616,7 +15289,7 @@ var wdtReissue = function wdtReissue(props) {
15616
15289
  disabled: disabled,
15617
15290
  allowClear: false,
15618
15291
  options: reasonList,
15619
- value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type30 = typeMap$1[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.typeName)],
15292
+ value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type27 = typeMap$1[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.typeName)],
15620
15293
  onChange: function onChange(val) {
15621
15294
  return changeTypeHandle(val);
15622
15295
  }
@@ -15628,19 +15301,13 @@ var wdtReissue = function wdtReissue(props) {
15628
15301
  canUpdateNumber: showChangeBtn,
15629
15302
  showChangeBtn: showChangeBtn,
15630
15303
  shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
15631
- value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type31 = typeMap$1[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.key)],
15304
+ value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type28 = typeMap$1[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.key)],
15632
15305
  onChange: function onChange(val) {
15633
15306
  return changeGoodHandle(val);
15634
15307
  },
15635
15308
  onModeChange: handleModeChange,
15636
15309
  showModeBtn: showModeBtn,
15637
- isStrict: isStrict,
15638
- tradeGoods: {
15639
- originDataSource: getGoodDetails({
15640
- mode: isStrict
15641
- }),
15642
- selectedGoodsChange: selectedGoodsChange
15643
- }
15310
+ isStrict: isStrict
15644
15311
  })));
15645
15312
  };
15646
15313
 
@@ -16328,7 +15995,6 @@ var CommonSystemOrder$1 = function CommonSystemOrder(props) {
16328
15995
 
16329
15996
  var _excluded$j = ["value", "onChange", "disabled", "failValue", "type"];
16330
15997
  var msgTypeCh = {
16331
- pdd: '拼多多',
16332
15998
  ding: '钉钉',
16333
15999
  wechat: '微信',
16334
16000
  qq: 'QQ',
@@ -16377,7 +16043,7 @@ var MsgStatus = function MsgStatus(props) {
16377
16043
  onClick: function onClick() {
16378
16044
  return setChangeIndex(index);
16379
16045
  }
16380
- }, msgTypeCh[key] || key, item.ruleName);
16046
+ }, msgTypeCh[key], item.ruleName);
16381
16047
  }))) : null, type === 1 ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Select, _objectSpread2(_objectSpread2({}, other), {}, {
16382
16048
  showSearch: true,
16383
16049
  value: (_value$changeIndex = value[changeIndex]) === null || _value$changeIndex === void 0 ? void 0 : _value$changeIndex.status,
package/dist/index.js CHANGED
@@ -10968,7 +10968,6 @@ var jstGoods = function jstGoods(props) {
10968
10968
  changeIndex = _useState2[0],
10969
10969
  setChangeIndex = _useState2[1]; //选中的包裹
10970
10970
  var sendOptions = kmkfUtils.SendDataCenter.getInstance(platformType).getSendData();
10971
- var isSelectName = ['wdt', 'bsE3', 'km'].includes(platformType);
10972
10971
  React.useEffect(function () {
10973
10972
  //没有值塞个默认值
10974
10973
  if (!(value === null || value === void 0 ? void 0 : value.length) && type !== 1) {
@@ -10999,7 +10998,7 @@ var jstGoods = function jstGoods(props) {
10999
10998
  var changeOrderInfo = _objectSpread2({}, value[changeIndex]);
11000
10999
  changeOrderInfo[type] = val;
11001
11000
  changeOrderInfo['sendId'] = option.value;
11002
- if (isSelectName && type === 'sendName') {
11001
+ if ((platformType === 'wdt' || platformType === 'bsE3') && type === 'sendName') {
11003
11002
  changeOrderInfo['sendSnapshotName'] = option.label;
11004
11003
  }
11005
11004
  var newList = _toConsumableArray(value);
@@ -11082,7 +11081,7 @@ var jstGoods = function jstGoods(props) {
11082
11081
  return changeInputHandle(e.target.value, 'sendId');
11083
11082
  },
11084
11083
  value: (_value$changeIndex5 = value[changeIndex]) === null || _value$changeIndex5 === void 0 ? void 0 : _value$changeIndex5.sendId
11085
- }), ['sendName', 'all'].includes(showField) && (isSelectName ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
11084
+ }), ['sendName', 'all'].includes(showField) && (platformType === 'wdt' || platformType === 'bsE3' ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
11086
11085
  style: {
11087
11086
  minWidth: '100px',
11088
11087
  maxWidth: '180px'
@@ -12588,104 +12587,6 @@ var getBsE3ReissueGoodColumns = function getBsE3ReissueGoodColumns(_ref4) {
12588
12587
  });
12589
12588
  };
12590
12589
 
12591
- var columns$4 = [{
12592
- dataIndex: 'goodId',
12593
- title: "\u5546\u54C1ID",
12594
- width: 70
12595
- }, {
12596
- dataIndex: 'goodNo',
12597
- title: "\u5546\u54C1\u7F16\u7801",
12598
- width: 180
12599
- }, {
12600
- dataIndex: 'goodName',
12601
- title: "\u5546\u54C1\u540D\u79F0",
12602
- width: 250
12603
- }, {
12604
- dataIndex: 'specId',
12605
- title: "SKUID",
12606
- width: 100
12607
- }, {
12608
- dataIndex: 'specNo',
12609
- title: "\u5546\u54C1SKU\u7F16\u7801",
12610
- width: 180
12611
- }, {
12612
- dataIndex: 'specName',
12613
- title: "\u5546\u54C1SKU\u540D\u79F0",
12614
- width: 250
12615
- }, {
12616
- dataIndex: 'orderPrice',
12617
- title: "\u5B9E\u4ED8\u603B\u91D1\u989D",
12618
- width: 100
12619
- }, {
12620
- dataIndex: 'num',
12621
- title: "\u6570\u91CF",
12622
- width: 100
12623
- }, {
12624
- dataIndex: 'sharePrice',
12625
- title: "\u5206\u644A\u4EF7",
12626
- width: 70
12627
- }, {
12628
- dataIndex: 'giftType',
12629
- title: "\u8D60\u54C1\u65B9\u5F0F",
12630
- width: 100
12631
- }];
12632
- var renderFieldMap$1 = {
12633
- num: function num(_ref) {
12634
- var disabled = _ref.disabled,
12635
- updateHandle = _ref.updateHandle;
12636
- return function (val, record, index) {
12637
- return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
12638
- style: {
12639
- width: 70
12640
- },
12641
- value: val,
12642
- min: 1,
12643
- precision: 0,
12644
- onChange: function onChange(num) {
12645
- return updateHandle(num, index, 'num');
12646
- }
12647
- }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
12648
- };
12649
- },
12650
- giftType: function giftType(_ref2) {
12651
- var disabled = _ref2.disabled,
12652
- updateHandle = _ref2.updateHandle;
12653
- return function (val) {
12654
- var giftTypeMap = {
12655
- 0: '非赠品',
12656
- 1: '自动赠送',
12657
- 2: '手工赠送',
12658
- 3: '回购自动送赠品',
12659
- 4: '前N有礼送赠品',
12660
- 6: '天猫优仓赠品',
12661
- 7: '淘宝CRM会员送赠'
12662
- };
12663
- return /*#__PURE__*/React__default['default'].createElement("span", null, giftTypeMap[val]);
12664
- };
12665
- }
12666
- };
12667
- var getWdtReissueGoodColumns = function getWdtReissueGoodColumns(_ref3) {
12668
- var disabled = _ref3.disabled,
12669
- updateHandle = _ref3.updateHandle,
12670
- operate = _ref3.operate;
12671
- return columns$4.map(function (item) {
12672
- var newItem = _objectSpread2({
12673
- align: 'center',
12674
- ellipsis: true
12675
- }, item);
12676
- if (operate && (renderFieldMap$1 === null || renderFieldMap$1 === void 0 ? void 0 : renderFieldMap$1[item.dataIndex])) {
12677
- return _objectSpread2(_objectSpread2({}, newItem), {}, {
12678
- render: renderFieldMap$1 === null || renderFieldMap$1 === void 0 ? void 0 : renderFieldMap$1[item.dataIndex]({
12679
- disabled: disabled,
12680
- updateHandle: updateHandle
12681
- })
12682
- });
12683
- }
12684
- return newItem;
12685
- });
12686
- };
12687
-
12688
- var MAIN_FIELD = 'id';
12689
12590
  var SelectTradeGoods = function SelectTradeGoods(_ref) {
12690
12591
  var columns = _ref.columns,
12691
12592
  dataSource = _ref.dataSource,
@@ -12701,20 +12602,11 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
12701
12602
  var closeModal = function closeModal() {
12702
12603
  return setTradeGoodsVisible(false);
12703
12604
  };
12704
- var currentTradeOriginGoods = lodash.intersection(dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (item) {
12705
- return item === null || item === void 0 ? void 0 : item[MAIN_FIELD];
12706
- }), selectedRowKeys);
12707
- var unCurrentTradeOriginGoods = lodash.difference(selectedRowKeys, dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (item) {
12708
- return item === null || item === void 0 ? void 0 : item[MAIN_FIELD];
12709
- }));
12710
- var handleChangeSelectedKeys = function handleChangeSelectedKeys(keys) {
12711
- console.log('handleChangeSelectedKeys', keys, unCurrentTradeOriginGoods);
12712
- onChangeSelectedKeys(keys.concat(unCurrentTradeOriginGoods));
12713
- };
12714
12605
  var rowSelection = {
12715
12606
  selectedRowKeys: selectedRowKeys,
12716
- onChange: handleChangeSelectedKeys
12607
+ onChange: onChangeSelectedKeys
12717
12608
  };
12609
+ console.debug('选择订单商品-dataSource', dataSource, selectedRowKeys);
12718
12610
  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Button, {
12719
12611
  type: "link",
12720
12612
  onClick: openModal
@@ -12724,7 +12616,7 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
12724
12616
  footer: null,
12725
12617
  onCancel: closeModal
12726
12618
  }, /*#__PURE__*/React__default['default'].createElement(antd.Table, {
12727
- rowKey: MAIN_FIELD,
12619
+ rowKey: "id",
12728
12620
  rowSelection: rowSelection,
12729
12621
  columns: columns,
12730
12622
  dataSource: dataSource,
@@ -12733,17 +12625,7 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
12733
12625
  x: 500,
12734
12626
  y: 500
12735
12627
  }
12736
- }), /*#__PURE__*/React__default['default'].createElement("span", null, "\u5DF2\u9009\u62E9(", currentTradeOriginGoods === null || currentTradeOriginGoods === void 0 ? void 0 : currentTradeOriginGoods.length, "/", dataSource === null || dataSource === void 0 ? void 0 : dataSource.length, ")")));
12737
- };
12738
- var getButtonText = function getButtonText() {
12739
- var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
12740
- if (['BS_E3_GOODS', 'BS_E3_REISSUE_GOODS', 'BS_E3_EXCHANGE_GOODS'].includes(type)) {
12741
- return '选择百胜ERP商品';
12742
- }
12743
- if (['WDT_REISSUE_GOODS'].includes(type)) {
12744
- return '选择旺店通商品';
12745
- }
12746
- return '选择商品';
12628
+ }), /*#__PURE__*/React__default['default'].createElement("span", null, "\u5DF2\u9009\u62E9(", selectedRowKeys === null || selectedRowKeys === void 0 ? void 0 : selectedRowKeys.length, "/", dataSource === null || dataSource === void 0 ? void 0 : dataSource.length, ")")));
12747
12629
  };
12748
12630
  var GoodItem$1 = function GoodItem(props) {
12749
12631
  var _props$value = props.value,
@@ -12800,7 +12682,7 @@ var GoodItem$1 = function GoodItem(props) {
12800
12682
  // TODO: 商品订单中以选中商品
12801
12683
  var selectedGoods = React.useMemo(function () {
12802
12684
  return value === null || value === void 0 ? void 0 : value.map(function (v) {
12803
- return v === null || v === void 0 ? void 0 : v[MAIN_FIELD];
12685
+ return v.id;
12804
12686
  });
12805
12687
  }, [value]);
12806
12688
  var updateHandle = function updateHandle(val, index, columnType) {
@@ -12841,14 +12723,6 @@ var GoodItem$1 = function GoodItem(props) {
12841
12723
  var columns = [];
12842
12724
  switch (type) {
12843
12725
  case 'WDT_REISSUE_GOODS':
12844
- {
12845
- columns = getWdtReissueGoodColumns({
12846
- disabled: disabled,
12847
- updateHandle: updateHandle,
12848
- operate: operate
12849
- });
12850
- }
12851
- break;
12852
12726
  case 'WDT_GOODS':
12853
12727
  columns = [{
12854
12728
  dataIndex: 'goodId',
@@ -13354,116 +13228,6 @@ var GoodItem$1 = function GoodItem(props) {
13354
13228
  });
13355
13229
  }
13356
13230
  break;
13357
- case 'BS_GOODS':
13358
- columns = [{
13359
- dataIndex: 'mark',
13360
- title: "\u5546\u54C1\u6807\u8BB0",
13361
- align: 'center',
13362
- ellipsis: true,
13363
- width: 70,
13364
- render: function render(val, record, index) {
13365
- return /*#__PURE__*/React__default['default'].createElement(antd.Select, {
13366
- options: [{
13367
- label: '是',
13368
- value: '是'
13369
- }, {
13370
- label: '否',
13371
- value: '否'
13372
- }],
13373
- disabled: disabled,
13374
- value: val,
13375
- onChange: function onChange(val) {
13376
- return updateHandle(val, index, 'mark');
13377
- }
13378
- });
13379
- }
13380
- }, {
13381
- dataIndex: 'skuName',
13382
- title: "".concat(text, "sku\u540D\u79F0"),
13383
- align: 'center',
13384
- ellipsis: true,
13385
- width: 250
13386
- }, {
13387
- dataIndex: 'sku',
13388
- title: "".concat(text, "sku\u7F16\u7801"),
13389
- align: 'center',
13390
- ellipsis: true,
13391
- width: 100
13392
- }, {
13393
- dataIndex: 'name',
13394
- title: "".concat(text, "\u540D\u79F0"),
13395
- align: 'center',
13396
- ellipsis: true,
13397
- width: 250
13398
- }, {
13399
- dataIndex: 'pic',
13400
- title: "\u56FE\u7247",
13401
- align: 'center',
13402
- ellipsis: true,
13403
- width: 100,
13404
- render: function render(val) {
13405
- return /*#__PURE__*/React__default['default'].createElement(antd.Image, {
13406
- width: 60,
13407
- src: val
13408
- });
13409
- }
13410
- }, {
13411
- dataIndex: 'code',
13412
- title: "".concat(text, "\u7F16\u7801"),
13413
- align: 'center',
13414
- ellipsis: true,
13415
- width: 100
13416
- }, {
13417
- dataIndex: 'money',
13418
- title: "\u5B9E\u4ED8\u91D1\u989D",
13419
- align: 'center',
13420
- ellipsis: true,
13421
- width: 100
13422
- }, {
13423
- dataIndex: 'number',
13424
- title: "".concat(text, "\u6570\u91CF"),
13425
- align: 'center',
13426
- ellipsis: true,
13427
- width: 100,
13428
- render: function render(val, record, index) {
13429
- return record.canUpdateNumber && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
13430
- style: {
13431
- width: 70
13432
- },
13433
- value: val,
13434
- min: 1,
13435
- precision: 0,
13436
- onChange: function onChange(num) {
13437
- return updateHandle(num, index, 'number');
13438
- }
13439
- }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
13440
- }
13441
- }, {
13442
- dataIndex: 'share',
13443
- title: "\u5206\u644A\u4EF7",
13444
- align: 'center',
13445
- ellipsis: true,
13446
- width: 70
13447
- }, {
13448
- dataIndex: 'type',
13449
- title: "\u8D60\u54C1\u7C7B\u578B",
13450
- align: 'center',
13451
- ellipsis: true,
13452
- width: 100
13453
- }, {
13454
- dataIndex: 'batch',
13455
- title: "\u6279\u6B21\u53F7",
13456
- align: 'center',
13457
- ellipsis: true,
13458
- width: 100
13459
- }, {
13460
- dataIndex: 'expireDate',
13461
- title: "\u6709\u6548\u671F",
13462
- align: 'center',
13463
- ellipsis: true,
13464
- width: 100
13465
- }];
13466
- break;
13467
13231
  default:
13468
13232
  columns = [{
13469
13233
  dataIndex: 'mark',
@@ -13732,7 +13496,7 @@ var GoodItem$1 = function GoodItem(props) {
13732
13496
  }), /*#__PURE__*/React__default['default'].createElement(antd.Button, {
13733
13497
  type: "link",
13734
13498
  onClick: handleChangeGoods
13735
- }, getButtonText(type)), otherOperations), /*#__PURE__*/React__default['default'].createElement(antd.Table, _objectSpread2(_objectSpread2({}, tableConfig), {}, {
13499
+ }, ['BS_E3_GOODS', 'BS_E3_REISSUE_GOODS', 'BS_E3_EXCHANGE_GOODS'].includes(type) ? '选择百胜ERP商品' : '选择商品'), otherOperations), /*#__PURE__*/React__default['default'].createElement(antd.Table, _objectSpread2(_objectSpread2({}, tableConfig), {}, {
13736
13500
  columns: newColumns,
13737
13501
  dataSource: value,
13738
13502
  rowKey: 'uuid',
@@ -14457,53 +14221,6 @@ var bsE3Utils = {
14457
14221
  getBsE3OrderListSingleton: getBsE3OrderListSingleton
14458
14222
  };
14459
14223
 
14460
- var singletonMap$2 = new Map();
14461
- var getOrderListSingleton = function getOrderListSingleton(orderNo) {
14462
- if (!singletonMap$2.has(orderNo)) {
14463
- var p = new Promise(function (resolve, reject) {
14464
- var doReject = function doReject(err) {
14465
- // 清空掉错误的请求记录
14466
- singletonMap$2.delete(orderNo);
14467
- reject(err);
14468
- };
14469
- extendRequest('/qy/gdfw/order/kmErpOrderDetail', {
14470
- method: 'post',
14471
- data: {
14472
- tid: orderNo
14473
- }
14474
- }).then(function (data) {
14475
- if (data === null || data === void 0 ? void 0 : data.success) {
14476
- var _data$data, _data$data$orderDetai;
14477
- if (data === null || data === void 0 ? void 0 : (_data$data = data.data) === null || _data$data === void 0 ? void 0 : (_data$data$orderDetai = _data$data.orderDetailDtoList) === null || _data$data$orderDetai === void 0 ? void 0 : _data$data$orderDetai.length) {
14478
- var list = kmkfUtils.filterKmOrders(data === null || data === void 0 ? void 0 : data.data, orderNo).map(function (item) {
14479
- return _objectSpread2(_objectSpread2({}, item), {}, {
14480
- billNo: item.sid,
14481
- sysStatus: item.sysStatus,
14482
- billType: item.type,
14483
- billTag: item.tags
14484
- });
14485
- });
14486
- resolve(list);
14487
- } else {
14488
- resolve([]);
14489
- }
14490
- // 延迟10秒清除,保证订单的时效性
14491
- setTimeout(function () {
14492
- singletonMap$2.delete(orderNo);
14493
- }, 1000 * 10);
14494
- } else {
14495
- doReject(data);
14496
- }
14497
- }).catch(doReject);
14498
- });
14499
- singletonMap$2.set(orderNo, p);
14500
- }
14501
- return singletonMap$2.get(orderNo);
14502
- };
14503
- var kmUtils = {
14504
- getOrderListSingleton: getOrderListSingleton
14505
- };
14506
-
14507
14224
  var columnsMap = {
14508
14225
  BS_SYSTEM_ORDER: [{
14509
14226
  title: '单据类型',
@@ -14533,7 +14250,6 @@ var columnsMap = {
14533
14250
  // },
14534
14251
  ],
14535
14252
 
14536
- KM_SYSTEM_ORDER: kmkfUtils.KM_SYSTEM_ORDER_CONFIG.columns,
14537
14253
  WLN_SYSTEM_ORDER: [{
14538
14254
  title: '订单类型',
14539
14255
  dataIndex: 'billType',
@@ -14630,7 +14346,6 @@ var columnsMap = {
14630
14346
  };
14631
14347
  var rowKeyMap = {
14632
14348
  BS_SYSTEM_ORDER: 'billNo',
14633
- KM_SYSTEM_ORDER: 'billNo',
14634
14349
  WLN_SYSTEM_ORDER: 'billNo',
14635
14350
  WDT_SYSTEM_ORDER: 'billNo',
14636
14351
  BS_E3_SYSTEM_ORDER: 'orderSn'
@@ -14647,8 +14362,6 @@ var index$1 = (function (props) {
14647
14362
  onceRef.current = true;
14648
14363
  if (type === 'BS_SYSTEM_ORDER') {
14649
14364
  getOrderList(value.orderNo);
14650
- } else if (type === 'KM_SYSTEM_ORDER') {
14651
- getKmOrderList(value.orderNo);
14652
14365
  } else if (type === 'WLN_SYSTEM_ORDER') {
14653
14366
  getWlnOrderList(value.orderNo);
14654
14367
  } else if (type === 'WDT_SYSTEM_ORDER') {
@@ -14810,37 +14523,6 @@ var index$1 = (function (props) {
14810
14523
  return _ref5.apply(this, arguments);
14811
14524
  };
14812
14525
  }();
14813
- var getKmOrderList = /*#__PURE__*/function () {
14814
- var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(orderNo) {
14815
- return _regeneratorRuntime().wrap(function _callee5$(_context5) {
14816
- while (1) switch (_context5.prev = _context5.next) {
14817
- case 0:
14818
- kmUtils.getOrderListSingleton(orderNo).then(function (trades) {
14819
- _onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, value), {}, {
14820
- orders: trades,
14821
- showOrderInfo: trades.map(function (_ref7) {
14822
- var billNo = _ref7.billNo,
14823
- billType = _ref7.billType,
14824
- billTag = _ref7.billTag;
14825
- return {
14826
- billNo: billNo,
14827
- billType: billType,
14828
- billTag: billTag
14829
- };
14830
- })
14831
- }));
14832
- });
14833
- onceRef.current = false;
14834
- case 2:
14835
- case "end":
14836
- return _context5.stop();
14837
- }
14838
- }, _callee5);
14839
- }));
14840
- return function getKmOrderList(_x5) {
14841
- return _ref6.apply(this, arguments);
14842
- };
14843
- }();
14844
14526
  var rowSelection = {
14845
14527
  selectedRowKeys: (value === null || value === void 0 ? void 0 : value.selectIds) || [],
14846
14528
  fixed: true,
@@ -15411,7 +15093,7 @@ var typeMap$1 = {
15411
15093
  }
15412
15094
  };
15413
15095
  var wdtReissue = function wdtReissue(props) {
15414
- var _value$wdtSystemOrder, _typeMap$type25, _typeMap$type27, _typeMap$type28, _value$typeMap$type$s5, _typeMap$type29, _typeMap$type30, _typeMap$type31;
15096
+ var _value$wdtSystemOrder, _typeMap$type24, _typeMap$type25, _value$typeMap$type$s5, _typeMap$type26, _typeMap$type27, _typeMap$type28;
15415
15097
  var value = props.value,
15416
15098
  onChange = props.onChange,
15417
15099
  _props$reasonList = props.reasonList,
@@ -15571,20 +15253,11 @@ var wdtReissue = function wdtReissue(props) {
15571
15253
  }
15572
15254
  onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
15573
15255
  };
15574
- var selectedGoodsChange = React.useCallback(function (skuList) {
15575
- var _typeMap$type23, _value, _typeMap$type24;
15576
- var newValue = _objectSpread2({}, value);
15577
- newValue["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type23 = typeMap$1[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.key)] = value === null || value === void 0 ? void 0 : (_value = value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type24 = typeMap$1[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.key)]) === null || _value === void 0 ? void 0 : _value.filter(function (item) {
15578
- return skuList.includes(item.id);
15579
- });
15580
- console.log('newValue', newValue);
15581
- onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
15582
- }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type25 = typeMap$1[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.key)]]);
15583
15256
  //显示选择商品按钮 原单换不显示选择商品
15584
15257
  var showChangeBtn = React.useMemo(function () {
15585
- var _typeMap$type26;
15586
- return !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type26 = typeMap$1[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.systemOrderNo]);
15587
- }, [value === null || value === void 0 ? void 0 : value[(_typeMap$type27 = typeMap$1[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.systemOrderNo]]);
15258
+ var _typeMap$type23;
15259
+ return !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type23 = typeMap$1[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.systemOrderNo]);
15260
+ }, [value === null || value === void 0 ? void 0 : value[(_typeMap$type24 = typeMap$1[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.systemOrderNo]]);
15588
15261
  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Row, {
15589
15262
  gutter: 8,
15590
15263
  wrap: true
@@ -15602,12 +15275,12 @@ var wdtReissue = function wdtReissue(props) {
15602
15275
  },
15603
15276
  disabled: disabled,
15604
15277
  allowClear: false,
15605
- value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type28 = typeMap$1[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.systemOrderNo)],
15278
+ value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type25 = typeMap$1[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.systemOrderNo)],
15606
15279
  onChange: function onChange(val) {
15607
15280
  return changeSystemOrderHandle(val);
15608
15281
  },
15609
15282
  placeholder: "\u9009\u62E9\u8865\u53D1\u7CFB\u7EDF\u5355"
15610
- }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s5 = value[(_typeMap$type29 = typeMap$1[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.systemOrder]) === null || _value$typeMap$type$s5 === void 0 ? void 0 : _value$typeMap$type$s5.showOrderInfo) || []).map(function (item) {
15283
+ }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s5 = value[(_typeMap$type26 = typeMap$1[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.systemOrder]) === null || _value$typeMap$type$s5 === void 0 ? void 0 : _value$typeMap$type$s5.showOrderInfo) || []).map(function (item) {
15611
15284
  return /*#__PURE__*/React__default['default'].createElement(antd.Select.Option, {
15612
15285
  key: item.billNo,
15613
15286
  value: item.billNo,
@@ -15628,7 +15301,7 @@ var wdtReissue = function wdtReissue(props) {
15628
15301
  disabled: disabled,
15629
15302
  allowClear: false,
15630
15303
  options: reasonList,
15631
- value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type30 = typeMap$1[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.typeName)],
15304
+ value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type27 = typeMap$1[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.typeName)],
15632
15305
  onChange: function onChange(val) {
15633
15306
  return changeTypeHandle(val);
15634
15307
  }
@@ -15640,19 +15313,13 @@ var wdtReissue = function wdtReissue(props) {
15640
15313
  canUpdateNumber: showChangeBtn,
15641
15314
  showChangeBtn: showChangeBtn,
15642
15315
  shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
15643
- value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type31 = typeMap$1[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.key)],
15316
+ value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type28 = typeMap$1[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.key)],
15644
15317
  onChange: function onChange(val) {
15645
15318
  return changeGoodHandle(val);
15646
15319
  },
15647
15320
  onModeChange: handleModeChange,
15648
15321
  showModeBtn: showModeBtn,
15649
- isStrict: isStrict,
15650
- tradeGoods: {
15651
- originDataSource: getGoodDetails({
15652
- mode: isStrict
15653
- }),
15654
- selectedGoodsChange: selectedGoodsChange
15655
- }
15322
+ isStrict: isStrict
15656
15323
  })));
15657
15324
  };
15658
15325
 
@@ -16340,7 +16007,6 @@ var CommonSystemOrder$1 = function CommonSystemOrder(props) {
16340
16007
 
16341
16008
  var _excluded$j = ["value", "onChange", "disabled", "failValue", "type"];
16342
16009
  var msgTypeCh = {
16343
- pdd: '拼多多',
16344
16010
  ding: '钉钉',
16345
16011
  wechat: '微信',
16346
16012
  qq: 'QQ',
@@ -16389,7 +16055,7 @@ var MsgStatus = function MsgStatus(props) {
16389
16055
  onClick: function onClick() {
16390
16056
  return setChangeIndex(index);
16391
16057
  }
16392
- }, msgTypeCh[key] || key, item.ruleName);
16058
+ }, msgTypeCh[key], item.ruleName);
16393
16059
  }))) : null, type === 1 ? /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Space, null, /*#__PURE__*/React__default['default'].createElement(antd.Select, _objectSpread2(_objectSpread2({}, other), {}, {
16394
16060
  showSearch: true,
16395
16061
  value: (_value$changeIndex = value[changeIndex]) === null || _value$changeIndex === void 0 ? void 0 : _value$changeIndex.status,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/basic-components",
3
- "version": "1.22.1-beta.9",
3
+ "version": "1.22.2",
4
4
  "description": "> TODO: description",
5
5
  "homepage": "",
6
6
  "license": "ISC",
@@ -11,16 +11,16 @@
11
11
  "dist"
12
12
  ],
13
13
  "scripts": {
14
+ "sync": "yarn build && yalc push",
14
15
  "build": "yarn lint && father-build",
15
16
  "lint": "eslint '**/*.{ts,tsx}'",
16
17
  "lint:fix": "eslint --fix '**/*.{ts,tsx}'",
17
18
  "start": "dumi dev",
18
- "sync": "yarn build && yalc push",
19
19
  "test": "jest",
20
20
  "watch": "nodemon --ignore dist/ --ignore node_modules/ --watch src/ -C -e ts,tsx,less --debug -x 'yarn async'"
21
21
  },
22
22
  "dependencies": {
23
- "@kmkf-fe-packages/kmkf-utils": "1.22.1-beta.9",
23
+ "@kmkf-fe-packages/kmkf-utils": "1.22.2",
24
24
  "ahooks": "^3.7.4",
25
25
  "bignumber.js": "^9.1.2",
26
26
  "kmkf-monitor": "^0.8.9",
@@ -65,5 +65,5 @@
65
65
  "publishConfig": {
66
66
  "access": "public"
67
67
  },
68
- "gitHead": "13dd10e5c480bf8bc57087360c4606d7fdf7fde8"
68
+ "gitHead": "5540cfeb14218b9454d3b133f2cf4f272a6a6ca7"
69
69
  }
@@ -1,21 +0,0 @@
1
- import React from 'react';
2
- type P = {
3
- disabled: boolean | undefined;
4
- updateHandle: (v: any, index: number, key: string) => void;
5
- operate?: boolean;
6
- };
7
- export declare const getWdtReissueGoodColumns: ({ disabled, updateHandle, operate }: P) => ({
8
- dataIndex: string;
9
- title: string;
10
- width: number;
11
- align: string;
12
- ellipsis: boolean;
13
- } | {
14
- render: (val: any, record: any, index: number) => React.JSX.Element;
15
- dataIndex: string;
16
- title: string;
17
- width: number;
18
- align: string;
19
- ellipsis: boolean;
20
- })[];
21
- export {};
@@ -1,4 +0,0 @@
1
- declare const _default: {
2
- getOrderListSingleton: (orderNo: string) => Promise<any>;
3
- };
4
- export default _default;