@kmkf-fe-packages/basic-components 1.22.1-beta.49 → 1.22.1-beta.50

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,7 +3,7 @@ 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, columnsGoodsList, LogisticsAddressData, SendDataCenter, BS_E3_BOOLEAN_STATUS_MAP, filterWdtOrders, WDT_ORDER_TYPE_MAP, filterBsE3Orders, filterKmOrders, KM_SYSTEM_ORDER_CONFIG, BS_E3_ORDER_STATUS_MAP, GY_SYSTEM_ORDER_CONFIG, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, msgTypeCh, filterGyOrders } from '@kmkf-fe-packages/kmkf-utils';
6
+ import { AddressData, BsAddressData, WdtAddressData, request as request$1, ExpressData, uuid, columnsGoodsList, LogisticsAddressData, SendDataCenter, BS_E3_BOOLEAN_STATUS_MAP, filterWdtOrders, WDT_ORDER_TYPE_MAP, filterBsE3Orders, filterGyOrders, filterKmOrders, KM_SYSTEM_ORDER_CONFIG, BS_E3_ORDER_STATUS_MAP, GY_SYSTEM_ORDER_CONFIG, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, msgTypeCh } from '@kmkf-fe-packages/kmkf-utils';
7
7
  import { debounce, isNaN as isNaN$1, isNumber as isNumber$1, cloneDeep, difference, differenceWith, takeRight, reject, isEmpty, intersection, uniqBy } from 'lodash';
8
8
  import { useUpdateEffect, useDebounceEffect, useAntdTable } from 'ahooks';
9
9
  import zhCN from 'antd/lib/locale/zh_CN';
@@ -12544,7 +12544,7 @@ var columns$3 = [{
12544
12544
  width: 250,
12545
12545
  ellipsis: true
12546
12546
  }, {
12547
- dataIndex: 'specCode',
12547
+ dataIndex: 'specNo',
12548
12548
  title: 'SKU编码',
12549
12549
  width: 200,
12550
12550
  ellipsis: true
@@ -13758,7 +13758,7 @@ var getColumns$4 = function getColumns(_ref) {
13758
13758
  ellipsis: true,
13759
13759
  width: 250
13760
13760
  }, {
13761
- dataIndex: 'specCode',
13761
+ dataIndex: 'specNo',
13762
13762
  title: "SKU\u7F16\u7801",
13763
13763
  align: 'center',
13764
13764
  ellipsis: true,
@@ -13871,7 +13871,7 @@ var getColumns$4 = function getColumns(_ref) {
13871
13871
  ellipsis: true,
13872
13872
  width: 250
13873
13873
  }, {
13874
- dataIndex: 'specCode',
13874
+ dataIndex: 'specNo',
13875
13875
  title: "SKU\u7F16\u7801",
13876
13876
  align: 'center',
13877
13877
  ellipsis: true,
@@ -14573,7 +14573,7 @@ var GoodItem$1 = function GoodItem(props) {
14573
14573
  goodShortName = item.goodShortName,
14574
14574
  goodNo = item.goodNo,
14575
14575
  specName = item.specName,
14576
- specCode = item.specCode,
14576
+ specNo = item.specNo,
14577
14577
  originPrice = item.originPrice;
14578
14578
  return _objectSpread2(_objectSpread2({}, item), {}, {
14579
14579
  uuid: uuid(),
@@ -14584,7 +14584,7 @@ var GoodItem$1 = function GoodItem(props) {
14584
14584
  goodShortName: goodShortName,
14585
14585
  goodNo: goodNo,
14586
14586
  specName: specName,
14587
- specCode: specCode,
14587
+ specNo: specNo,
14588
14588
  originPrice: originPrice
14589
14589
  });
14590
14590
  });
@@ -15389,7 +15389,7 @@ var bsE3Utils = {
15389
15389
  };
15390
15390
 
15391
15391
  var singletonMap$2 = new Map();
15392
- var getOrderListSingleton = function getOrderListSingleton(orderNo) {
15392
+ var getGyOrderListSingleton = function getGyOrderListSingleton(orderNo) {
15393
15393
  if (!singletonMap$2.has(orderNo)) {
15394
15394
  var p = new Promise(function (resolve, reject) {
15395
15395
  var doReject = function doReject(err) {
@@ -15397,6 +15397,52 @@ var getOrderListSingleton = function getOrderListSingleton(orderNo) {
15397
15397
  singletonMap$2.delete(orderNo);
15398
15398
  reject(err);
15399
15399
  };
15400
+ extendRequest('/qy/gdfw/oms/gyOrderDetail', {
15401
+ method: 'post',
15402
+ data: {
15403
+ tid: orderNo
15404
+ }
15405
+ }).then(function (res) {
15406
+ if (res === null || res === void 0 ? void 0 : res.success) {
15407
+ var _res$data;
15408
+ if (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.length) {
15409
+ res.data.trades = filterGyOrders(res === null || res === void 0 ? void 0 : res.data, orderNo).map(function (item) {
15410
+ return _objectSpread2(_objectSpread2({}, item), {}, {
15411
+ billNo: item.code,
15412
+ billType: item.orderTypeName,
15413
+ billTag: item.tagName,
15414
+ tradeTagName: item.tradeTagName,
15415
+ deliveryState: item.deliveryState
15416
+ });
15417
+ });
15418
+ }
15419
+ resolve(res.data);
15420
+ // 延迟10秒清除,保证订单的时效性
15421
+ setTimeout(function () {
15422
+ singletonMap$2.delete(orderNo);
15423
+ }, 1000 * 10);
15424
+ } else {
15425
+ doReject(res);
15426
+ }
15427
+ }).catch(doReject);
15428
+ });
15429
+ singletonMap$2.set(orderNo, p);
15430
+ }
15431
+ return singletonMap$2.get(orderNo);
15432
+ };
15433
+ var gyUtils = {
15434
+ getGyOrderListSingleton: getGyOrderListSingleton
15435
+ };
15436
+
15437
+ var singletonMap$3 = new Map();
15438
+ var getOrderListSingleton = function getOrderListSingleton(orderNo) {
15439
+ if (!singletonMap$3.has(orderNo)) {
15440
+ var p = new Promise(function (resolve, reject) {
15441
+ var doReject = function doReject(err) {
15442
+ // 清空掉错误的请求记录
15443
+ singletonMap$3.delete(orderNo);
15444
+ reject(err);
15445
+ };
15400
15446
  extendRequest('/qy/gdfw/order/kmErpOrderDetail', {
15401
15447
  method: 'post',
15402
15448
  data: {
@@ -15420,16 +15466,16 @@ var getOrderListSingleton = function getOrderListSingleton(orderNo) {
15420
15466
  }
15421
15467
  // 延迟10秒清除,保证订单的时效性
15422
15468
  setTimeout(function () {
15423
- singletonMap$2.delete(orderNo);
15469
+ singletonMap$3.delete(orderNo);
15424
15470
  }, 1000 * 10);
15425
15471
  } else {
15426
15472
  doReject(data);
15427
15473
  }
15428
15474
  }).catch(doReject);
15429
15475
  });
15430
- singletonMap$2.set(orderNo, p);
15476
+ singletonMap$3.set(orderNo, p);
15431
15477
  }
15432
- return singletonMap$2.get(orderNo);
15478
+ return singletonMap$3.get(orderNo);
15433
15479
  };
15434
15480
  var kmUtils = {
15435
15481
  getOrderListSingleton: getOrderListSingleton
@@ -15588,6 +15634,9 @@ var index$1 = (function (props) {
15588
15634
  getWdtOrderList(value.orderNo);
15589
15635
  } else if (type === 'BS_E3_SYSTEM_ORDER') {
15590
15636
  getBsE3OrderList(value.orderNo);
15637
+ } else if (type === 'GY_SYSTEM_ORDER') {
15638
+ console.log('触发gy--getGyOrderList--1');
15639
+ getGyOrderList(value.orderNo);
15591
15640
  }
15592
15641
  }
15593
15642
  }, [value, type]);
@@ -15774,6 +15823,44 @@ var index$1 = (function (props) {
15774
15823
  return _ref6.apply(this, arguments);
15775
15824
  };
15776
15825
  }();
15826
+ var getGyOrderList = /*#__PURE__*/function () {
15827
+ var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(orderNo) {
15828
+ return _regeneratorRuntime().wrap(function _callee6$(_context6) {
15829
+ while (1) switch (_context6.prev = _context6.next) {
15830
+ case 0:
15831
+ gyUtils.getGyOrderListSingleton(orderNo).then(function (data) {
15832
+ var trades = ((data === null || data === void 0 ? void 0 : data.trades) || []).filter(function (item) {
15833
+ return (item.billNo || '').split(',').includes(orderNo);
15834
+ });
15835
+ _onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, value), {}, {
15836
+ orders: trades,
15837
+ showOrderInfo: trades.map(function (_ref9) {
15838
+ var billNo = _ref9.billNo,
15839
+ billType = _ref9.billType,
15840
+ billTag = _ref9.billTag,
15841
+ tradeTagName = _ref9.tradeTagName,
15842
+ deliveryState = _ref9.deliveryState;
15843
+ return {
15844
+ billNo: billNo,
15845
+ billType: billType,
15846
+ billTag: billTag,
15847
+ tradeTagName: tradeTagName,
15848
+ deliveryState: deliveryState
15849
+ };
15850
+ })
15851
+ }));
15852
+ });
15853
+ onceRef.current = false;
15854
+ case 2:
15855
+ case "end":
15856
+ return _context6.stop();
15857
+ }
15858
+ }, _callee6);
15859
+ }));
15860
+ return function getGyOrderList(_x6) {
15861
+ return _ref8.apply(this, arguments);
15862
+ };
15863
+ }();
15777
15864
  var rowSelection = {
15778
15865
  selectedRowKeys: (value === null || value === void 0 ? void 0 : value.selectIds) || [],
15779
15866
  fixed: true,
@@ -17617,50 +17704,8 @@ var bsE3Reissue = function bsE3Reissue(props) {
17617
17704
  })));
17618
17705
  };
17619
17706
 
17620
- var singletonMap$3 = new Map();
17621
- var getGyOrderListSingleton = function getGyOrderListSingleton(orderNo) {
17622
- if (!singletonMap$3.has(orderNo)) {
17623
- var p = new Promise(function (resolve, reject) {
17624
- var doReject = function doReject(err) {
17625
- // 清空掉错误的请求记录
17626
- singletonMap$3.delete(orderNo);
17627
- reject(err);
17628
- };
17629
- extendRequest('/qy/gdfw/oms/gyOrderDetail', {
17630
- method: 'post',
17631
- data: {
17632
- tid: orderNo
17633
- }
17634
- }).then(function (data) {
17635
- if (data === null || data === void 0 ? void 0 : data.success) {
17636
- var _data$data, _data$data$trades;
17637
- if (data === null || data === void 0 ? void 0 : (_data$data = data.data) === null || _data$data === void 0 ? void 0 : (_data$data$trades = _data$data.trades) === null || _data$data$trades === void 0 ? void 0 : _data$data$trades.length) {
17638
- data.data.trades = filterGyOrders(data === null || data === void 0 ? void 0 : data.data, orderNo).map(function (item) {
17639
- return _objectSpread2(_objectSpread2({}, item), {}, {
17640
- billNo: item.tradeNo,
17641
- billTag: item.tagName
17642
- });
17643
- });
17644
- }
17645
- resolve(data.data);
17646
- // 延迟10秒清除,保证订单的时效性
17647
- setTimeout(function () {
17648
- singletonMap$3.delete(orderNo);
17649
- }, 1000 * 10);
17650
- } else {
17651
- doReject(data);
17652
- }
17653
- }).catch(doReject);
17654
- });
17655
- singletonMap$3.set(orderNo, p);
17656
- }
17657
- return singletonMap$3.get(orderNo);
17658
- };
17659
- var gyUtils = {
17660
- getGyOrderListSingleton: getGyOrderListSingleton
17661
- };
17662
-
17663
- var _excluded$l = ["value", "onChange", "reasonList", "disabled", "type"];
17707
+ var _excluded$l = ["value", "onChange", "reasonList", "disabled", "type"],
17708
+ _excluded2 = ["billNo", "billType", "billTag", "tradeTagName", "deliveryState"];
17664
17709
  var typeMap$3 = {
17665
17710
  GY_REISSUE_GOODS: {
17666
17711
  key: 'gyReissueGoods',
@@ -17690,8 +17735,8 @@ var GyReissue = function GyReissue(props) {
17690
17735
  type = props.type,
17691
17736
  other = _objectWithoutProperties(props, _excluded$l);
17692
17737
  var showModeBtn = ((value === null || value === void 0 ? void 0 : (_value$gySystemOrder = value.gySystemOrder) === null || _value$gySystemOrder === void 0 ? void 0 : _value$gySystemOrder.orders) || []).some(function (order) {
17693
- var _order$srcTid;
17694
- return order === null || order === void 0 ? void 0 : (_order$srcTid = order.srcTid) === null || _order$srcTid === void 0 ? void 0 : _order$srcTid.includes(',');
17738
+ var _order$platformCode;
17739
+ return order === null || order === void 0 ? void 0 : (_order$platformCode = order.platformCode) === null || _order$platformCode === void 0 ? void 0 : _order$platformCode.includes(',');
17695
17740
  });
17696
17741
  var getOrderFlag = useRef(false);
17697
17742
  var _useState = useState(false),
@@ -17719,12 +17764,17 @@ var GyReissue = function GyReissue(props) {
17719
17764
  var showOrderInfo = orders.map(function (_ref2) {
17720
17765
  var billNo = _ref2.billNo,
17721
17766
  billType = _ref2.billType,
17722
- billTag = _ref2.billTag;
17723
- return {
17767
+ billTag = _ref2.billTag,
17768
+ tradeTagName = _ref2.tradeTagName,
17769
+ deliveryState = _ref2.deliveryState,
17770
+ rest = _objectWithoutProperties(_ref2, _excluded2);
17771
+ return _objectSpread2(_objectSpread2({}, rest), {}, {
17724
17772
  billNo: billNo,
17725
17773
  billType: billType,
17726
- billTag: billTag
17727
- };
17774
+ billTag: billTag,
17775
+ tradeTagName: tradeTagName,
17776
+ deliveryState: deliveryState
17777
+ });
17728
17778
  });
17729
17779
  onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, (_typeMap$type5 = typeMap$3[type]) === null || _typeMap$type5 === void 0 ? void 0 : _typeMap$type5.systemOrder, _objectSpread2(_objectSpread2({}, value[(_typeMap$type6 = typeMap$3[type]) === null || _typeMap$type6 === void 0 ? void 0 : _typeMap$type6.systemOrder]), {}, {
17730
17780
  showOrderInfo: showOrderInfo,
@@ -17770,18 +17820,18 @@ var GyReissue = function GyReissue(props) {
17770
17820
  }))));
17771
17821
  };
17772
17822
  var getGoodDetails = function getGoodDetails(_ref3) {
17773
- var _typeMap$type13, _typeMap$type14, _order$goodDetails;
17823
+ var _typeMap$type13, _typeMap$type14, _order$details;
17774
17824
  var mode = _ref3.mode,
17775
17825
  sysOrderNo = _ref3.sysOrderNo;
17776
17826
  var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type13 = typeMap$3[type]) === null || _typeMap$type13 === void 0 ? void 0 : _typeMap$type13.systemOrder];
17777
17827
  var systemOrderNo = sysOrderNo !== null && sysOrderNo !== void 0 ? sysOrderNo : value === null || value === void 0 ? void 0 : value[(_typeMap$type14 = typeMap$3[type]) === null || _typeMap$type14 === void 0 ? void 0 : _typeMap$type14.systemOrderNo];
17778
17828
  var order = systemOrderNo && ((systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || []).find(function (order) {
17779
- return order.tradeNo === systemOrderNo;
17829
+ return order.code === systemOrderNo;
17780
17830
  });
17781
- var goodDetails = (order === null || order === void 0 ? void 0 : (_order$goodDetails = order.goodDetails) === null || _order$goodDetails === void 0 ? void 0 : _order$goodDetails.length) ? updateGyGoodsHandle([order]) : [];
17831
+ var goodDetails = (order === null || order === void 0 ? void 0 : (_order$details = order.details) === null || _order$details === void 0 ? void 0 : _order$details.length) ? updateGyGoodsHandle([order]) : [];
17782
17832
  var orderNo = systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orderNo;
17783
17833
  return mode ? goodDetails.filter(function (goodItem) {
17784
- return !orderNo || goodItem.srcTid === orderNo;
17834
+ return !orderNo || goodItem.platformCode === orderNo;
17785
17835
  }) : goodDetails;
17786
17836
  };
17787
17837
  var changeGoodHandle = function changeGoodHandle(val) {
package/dist/index.js CHANGED
@@ -12556,7 +12556,7 @@ var columns$3 = [{
12556
12556
  width: 250,
12557
12557
  ellipsis: true
12558
12558
  }, {
12559
- dataIndex: 'specCode',
12559
+ dataIndex: 'specNo',
12560
12560
  title: 'SKU编码',
12561
12561
  width: 200,
12562
12562
  ellipsis: true
@@ -13770,7 +13770,7 @@ var getColumns$4 = function getColumns(_ref) {
13770
13770
  ellipsis: true,
13771
13771
  width: 250
13772
13772
  }, {
13773
- dataIndex: 'specCode',
13773
+ dataIndex: 'specNo',
13774
13774
  title: "SKU\u7F16\u7801",
13775
13775
  align: 'center',
13776
13776
  ellipsis: true,
@@ -13883,7 +13883,7 @@ var getColumns$4 = function getColumns(_ref) {
13883
13883
  ellipsis: true,
13884
13884
  width: 250
13885
13885
  }, {
13886
- dataIndex: 'specCode',
13886
+ dataIndex: 'specNo',
13887
13887
  title: "SKU\u7F16\u7801",
13888
13888
  align: 'center',
13889
13889
  ellipsis: true,
@@ -14585,7 +14585,7 @@ var GoodItem$1 = function GoodItem(props) {
14585
14585
  goodShortName = item.goodShortName,
14586
14586
  goodNo = item.goodNo,
14587
14587
  specName = item.specName,
14588
- specCode = item.specCode,
14588
+ specNo = item.specNo,
14589
14589
  originPrice = item.originPrice;
14590
14590
  return _objectSpread2(_objectSpread2({}, item), {}, {
14591
14591
  uuid: kmkfUtils.uuid(),
@@ -14596,7 +14596,7 @@ var GoodItem$1 = function GoodItem(props) {
14596
14596
  goodShortName: goodShortName,
14597
14597
  goodNo: goodNo,
14598
14598
  specName: specName,
14599
- specCode: specCode,
14599
+ specNo: specNo,
14600
14600
  originPrice: originPrice
14601
14601
  });
14602
14602
  });
@@ -15401,7 +15401,7 @@ var bsE3Utils = {
15401
15401
  };
15402
15402
 
15403
15403
  var singletonMap$2 = new Map();
15404
- var getOrderListSingleton = function getOrderListSingleton(orderNo) {
15404
+ var getGyOrderListSingleton = function getGyOrderListSingleton(orderNo) {
15405
15405
  if (!singletonMap$2.has(orderNo)) {
15406
15406
  var p = new Promise(function (resolve, reject) {
15407
15407
  var doReject = function doReject(err) {
@@ -15409,6 +15409,52 @@ var getOrderListSingleton = function getOrderListSingleton(orderNo) {
15409
15409
  singletonMap$2.delete(orderNo);
15410
15410
  reject(err);
15411
15411
  };
15412
+ extendRequest('/qy/gdfw/oms/gyOrderDetail', {
15413
+ method: 'post',
15414
+ data: {
15415
+ tid: orderNo
15416
+ }
15417
+ }).then(function (res) {
15418
+ if (res === null || res === void 0 ? void 0 : res.success) {
15419
+ var _res$data;
15420
+ if (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.length) {
15421
+ res.data.trades = kmkfUtils.filterGyOrders(res === null || res === void 0 ? void 0 : res.data, orderNo).map(function (item) {
15422
+ return _objectSpread2(_objectSpread2({}, item), {}, {
15423
+ billNo: item.code,
15424
+ billType: item.orderTypeName,
15425
+ billTag: item.tagName,
15426
+ tradeTagName: item.tradeTagName,
15427
+ deliveryState: item.deliveryState
15428
+ });
15429
+ });
15430
+ }
15431
+ resolve(res.data);
15432
+ // 延迟10秒清除,保证订单的时效性
15433
+ setTimeout(function () {
15434
+ singletonMap$2.delete(orderNo);
15435
+ }, 1000 * 10);
15436
+ } else {
15437
+ doReject(res);
15438
+ }
15439
+ }).catch(doReject);
15440
+ });
15441
+ singletonMap$2.set(orderNo, p);
15442
+ }
15443
+ return singletonMap$2.get(orderNo);
15444
+ };
15445
+ var gyUtils = {
15446
+ getGyOrderListSingleton: getGyOrderListSingleton
15447
+ };
15448
+
15449
+ var singletonMap$3 = new Map();
15450
+ var getOrderListSingleton = function getOrderListSingleton(orderNo) {
15451
+ if (!singletonMap$3.has(orderNo)) {
15452
+ var p = new Promise(function (resolve, reject) {
15453
+ var doReject = function doReject(err) {
15454
+ // 清空掉错误的请求记录
15455
+ singletonMap$3.delete(orderNo);
15456
+ reject(err);
15457
+ };
15412
15458
  extendRequest('/qy/gdfw/order/kmErpOrderDetail', {
15413
15459
  method: 'post',
15414
15460
  data: {
@@ -15432,16 +15478,16 @@ var getOrderListSingleton = function getOrderListSingleton(orderNo) {
15432
15478
  }
15433
15479
  // 延迟10秒清除,保证订单的时效性
15434
15480
  setTimeout(function () {
15435
- singletonMap$2.delete(orderNo);
15481
+ singletonMap$3.delete(orderNo);
15436
15482
  }, 1000 * 10);
15437
15483
  } else {
15438
15484
  doReject(data);
15439
15485
  }
15440
15486
  }).catch(doReject);
15441
15487
  });
15442
- singletonMap$2.set(orderNo, p);
15488
+ singletonMap$3.set(orderNo, p);
15443
15489
  }
15444
- return singletonMap$2.get(orderNo);
15490
+ return singletonMap$3.get(orderNo);
15445
15491
  };
15446
15492
  var kmUtils = {
15447
15493
  getOrderListSingleton: getOrderListSingleton
@@ -15600,6 +15646,9 @@ var index$1 = (function (props) {
15600
15646
  getWdtOrderList(value.orderNo);
15601
15647
  } else if (type === 'BS_E3_SYSTEM_ORDER') {
15602
15648
  getBsE3OrderList(value.orderNo);
15649
+ } else if (type === 'GY_SYSTEM_ORDER') {
15650
+ console.log('触发gy--getGyOrderList--1');
15651
+ getGyOrderList(value.orderNo);
15603
15652
  }
15604
15653
  }
15605
15654
  }, [value, type]);
@@ -15786,6 +15835,44 @@ var index$1 = (function (props) {
15786
15835
  return _ref6.apply(this, arguments);
15787
15836
  };
15788
15837
  }();
15838
+ var getGyOrderList = /*#__PURE__*/function () {
15839
+ var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(orderNo) {
15840
+ return _regeneratorRuntime().wrap(function _callee6$(_context6) {
15841
+ while (1) switch (_context6.prev = _context6.next) {
15842
+ case 0:
15843
+ gyUtils.getGyOrderListSingleton(orderNo).then(function (data) {
15844
+ var trades = ((data === null || data === void 0 ? void 0 : data.trades) || []).filter(function (item) {
15845
+ return (item.billNo || '').split(',').includes(orderNo);
15846
+ });
15847
+ _onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, value), {}, {
15848
+ orders: trades,
15849
+ showOrderInfo: trades.map(function (_ref9) {
15850
+ var billNo = _ref9.billNo,
15851
+ billType = _ref9.billType,
15852
+ billTag = _ref9.billTag,
15853
+ tradeTagName = _ref9.tradeTagName,
15854
+ deliveryState = _ref9.deliveryState;
15855
+ return {
15856
+ billNo: billNo,
15857
+ billType: billType,
15858
+ billTag: billTag,
15859
+ tradeTagName: tradeTagName,
15860
+ deliveryState: deliveryState
15861
+ };
15862
+ })
15863
+ }));
15864
+ });
15865
+ onceRef.current = false;
15866
+ case 2:
15867
+ case "end":
15868
+ return _context6.stop();
15869
+ }
15870
+ }, _callee6);
15871
+ }));
15872
+ return function getGyOrderList(_x6) {
15873
+ return _ref8.apply(this, arguments);
15874
+ };
15875
+ }();
15789
15876
  var rowSelection = {
15790
15877
  selectedRowKeys: (value === null || value === void 0 ? void 0 : value.selectIds) || [],
15791
15878
  fixed: true,
@@ -17629,50 +17716,8 @@ var bsE3Reissue = function bsE3Reissue(props) {
17629
17716
  })));
17630
17717
  };
17631
17718
 
17632
- var singletonMap$3 = new Map();
17633
- var getGyOrderListSingleton = function getGyOrderListSingleton(orderNo) {
17634
- if (!singletonMap$3.has(orderNo)) {
17635
- var p = new Promise(function (resolve, reject) {
17636
- var doReject = function doReject(err) {
17637
- // 清空掉错误的请求记录
17638
- singletonMap$3.delete(orderNo);
17639
- reject(err);
17640
- };
17641
- extendRequest('/qy/gdfw/oms/gyOrderDetail', {
17642
- method: 'post',
17643
- data: {
17644
- tid: orderNo
17645
- }
17646
- }).then(function (data) {
17647
- if (data === null || data === void 0 ? void 0 : data.success) {
17648
- var _data$data, _data$data$trades;
17649
- if (data === null || data === void 0 ? void 0 : (_data$data = data.data) === null || _data$data === void 0 ? void 0 : (_data$data$trades = _data$data.trades) === null || _data$data$trades === void 0 ? void 0 : _data$data$trades.length) {
17650
- data.data.trades = kmkfUtils.filterGyOrders(data === null || data === void 0 ? void 0 : data.data, orderNo).map(function (item) {
17651
- return _objectSpread2(_objectSpread2({}, item), {}, {
17652
- billNo: item.tradeNo,
17653
- billTag: item.tagName
17654
- });
17655
- });
17656
- }
17657
- resolve(data.data);
17658
- // 延迟10秒清除,保证订单的时效性
17659
- setTimeout(function () {
17660
- singletonMap$3.delete(orderNo);
17661
- }, 1000 * 10);
17662
- } else {
17663
- doReject(data);
17664
- }
17665
- }).catch(doReject);
17666
- });
17667
- singletonMap$3.set(orderNo, p);
17668
- }
17669
- return singletonMap$3.get(orderNo);
17670
- };
17671
- var gyUtils = {
17672
- getGyOrderListSingleton: getGyOrderListSingleton
17673
- };
17674
-
17675
- var _excluded$l = ["value", "onChange", "reasonList", "disabled", "type"];
17719
+ var _excluded$l = ["value", "onChange", "reasonList", "disabled", "type"],
17720
+ _excluded2 = ["billNo", "billType", "billTag", "tradeTagName", "deliveryState"];
17676
17721
  var typeMap$3 = {
17677
17722
  GY_REISSUE_GOODS: {
17678
17723
  key: 'gyReissueGoods',
@@ -17702,8 +17747,8 @@ var GyReissue = function GyReissue(props) {
17702
17747
  type = props.type,
17703
17748
  other = _objectWithoutProperties(props, _excluded$l);
17704
17749
  var showModeBtn = ((value === null || value === void 0 ? void 0 : (_value$gySystemOrder = value.gySystemOrder) === null || _value$gySystemOrder === void 0 ? void 0 : _value$gySystemOrder.orders) || []).some(function (order) {
17705
- var _order$srcTid;
17706
- return order === null || order === void 0 ? void 0 : (_order$srcTid = order.srcTid) === null || _order$srcTid === void 0 ? void 0 : _order$srcTid.includes(',');
17750
+ var _order$platformCode;
17751
+ return order === null || order === void 0 ? void 0 : (_order$platformCode = order.platformCode) === null || _order$platformCode === void 0 ? void 0 : _order$platformCode.includes(',');
17707
17752
  });
17708
17753
  var getOrderFlag = React.useRef(false);
17709
17754
  var _useState = React.useState(false),
@@ -17731,12 +17776,17 @@ var GyReissue = function GyReissue(props) {
17731
17776
  var showOrderInfo = orders.map(function (_ref2) {
17732
17777
  var billNo = _ref2.billNo,
17733
17778
  billType = _ref2.billType,
17734
- billTag = _ref2.billTag;
17735
- return {
17779
+ billTag = _ref2.billTag,
17780
+ tradeTagName = _ref2.tradeTagName,
17781
+ deliveryState = _ref2.deliveryState,
17782
+ rest = _objectWithoutProperties(_ref2, _excluded2);
17783
+ return _objectSpread2(_objectSpread2({}, rest), {}, {
17736
17784
  billNo: billNo,
17737
17785
  billType: billType,
17738
- billTag: billTag
17739
- };
17786
+ billTag: billTag,
17787
+ tradeTagName: tradeTagName,
17788
+ deliveryState: deliveryState
17789
+ });
17740
17790
  });
17741
17791
  onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, (_typeMap$type5 = typeMap$3[type]) === null || _typeMap$type5 === void 0 ? void 0 : _typeMap$type5.systemOrder, _objectSpread2(_objectSpread2({}, value[(_typeMap$type6 = typeMap$3[type]) === null || _typeMap$type6 === void 0 ? void 0 : _typeMap$type6.systemOrder]), {}, {
17742
17792
  showOrderInfo: showOrderInfo,
@@ -17782,18 +17832,18 @@ var GyReissue = function GyReissue(props) {
17782
17832
  }))));
17783
17833
  };
17784
17834
  var getGoodDetails = function getGoodDetails(_ref3) {
17785
- var _typeMap$type13, _typeMap$type14, _order$goodDetails;
17835
+ var _typeMap$type13, _typeMap$type14, _order$details;
17786
17836
  var mode = _ref3.mode,
17787
17837
  sysOrderNo = _ref3.sysOrderNo;
17788
17838
  var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type13 = typeMap$3[type]) === null || _typeMap$type13 === void 0 ? void 0 : _typeMap$type13.systemOrder];
17789
17839
  var systemOrderNo = sysOrderNo !== null && sysOrderNo !== void 0 ? sysOrderNo : value === null || value === void 0 ? void 0 : value[(_typeMap$type14 = typeMap$3[type]) === null || _typeMap$type14 === void 0 ? void 0 : _typeMap$type14.systemOrderNo];
17790
17840
  var order = systemOrderNo && ((systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || []).find(function (order) {
17791
- return order.tradeNo === systemOrderNo;
17841
+ return order.code === systemOrderNo;
17792
17842
  });
17793
- var goodDetails = (order === null || order === void 0 ? void 0 : (_order$goodDetails = order.goodDetails) === null || _order$goodDetails === void 0 ? void 0 : _order$goodDetails.length) ? kmkfUtils.updateGyGoodsHandle([order]) : [];
17843
+ var goodDetails = (order === null || order === void 0 ? void 0 : (_order$details = order.details) === null || _order$details === void 0 ? void 0 : _order$details.length) ? kmkfUtils.updateGyGoodsHandle([order]) : [];
17794
17844
  var orderNo = systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orderNo;
17795
17845
  return mode ? goodDetails.filter(function (goodItem) {
17796
- return !orderNo || goodItem.srcTid === orderNo;
17846
+ return !orderNo || goodItem.platformCode === orderNo;
17797
17847
  }) : goodDetails;
17798
17848
  };
17799
17849
  var changeGoodHandle = function changeGoodHandle(val) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/basic-components",
3
- "version": "1.22.1-beta.49",
3
+ "version": "1.22.1-beta.50",
4
4
  "description": "> TODO: description",
5
5
  "homepage": "",
6
6
  "license": "ISC",
@@ -20,7 +20,7 @@
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.49",
23
+ "@kmkf-fe-packages/kmkf-utils": "1.22.1-beta.50",
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": "e42ad29847184a154f4a15b93a1ab818316c62ca"
68
+ "gitHead": "b658ec85d5bf6c907966e2a2f66cfb9888ab63e4"
69
69
  }