@kmkf-fe-packages/basic-components 2.0.54-beta.4 → 2.0.54-beta.7

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 (4) hide show
  1. package/dist/index.esm.js +29 -35
  2. package/dist/index.js +29 -35
  3. package/dist/src/jst/Goods/index.d.ts +2 -0
  4. package/package.json +3 -3
package/dist/index.esm.js CHANGED
@@ -11502,7 +11502,7 @@ var typeInitValueMap = {
11502
11502
  }]
11503
11503
  };
11504
11504
  var jstGoods = function jstGoods(props) {
11505
- var _value$changeIndex, _value$changeIndex2, _value$changeIndex3, _value$changeIndex4, _value$changeIndex5, _value$changeIndex6, _value$changeIndex7, _value$changeIndex8, _value$changeIndex9;
11505
+ var _value$changeIndex, _value$changeIndex2, _value$changeIndex3, _value$changeIndex4, _value$changeIndex5, _value$changeIndex6, _value$changeIndex7, _value$changeIndex8, _value$changeIndex9, _value$changeIndex10, _value$changeIndex11;
11506
11506
  var _props$value = props.value,
11507
11507
  value = _props$value === void 0 ? [] : _props$value,
11508
11508
  onChange = props.onChange,
@@ -11520,8 +11520,8 @@ var jstGoods = function jstGoods(props) {
11520
11520
  setChangeIndex = _useState2[1]; //选中的包裹
11521
11521
  var sendOptions = SendDataCenter.getInstance(platformType).getSendData();
11522
11522
  var isSelectName = ['wdt', 'bsE3', 'km', 'gy', 'jst'].includes(platformType);
11523
+ var expressDateInstance = ExpressData.getInstance(platformType);
11523
11524
  var isSendGoodSavedId = isSelectName && !['jst'].includes(platformType);
11524
- var logisticsType = type === 1 && platformType === 'gy' ? 'input' : 'select';
11525
11525
  useEffect(function () {
11526
11526
  //没有值塞个默认值
11527
11527
  if (!(value === null || value === void 0 ? void 0 : value.length) && type !== 1) {
@@ -11604,59 +11604,51 @@ var jstGoods = function jstGoods(props) {
11604
11604
  return setChangeIndex(index);
11605
11605
  }
11606
11606
  }, "\u5305\u88F9".concat(index + 1)));
11607
- }))) : null, value.length || type === 1 ? /*#__PURE__*/React.createElement(React.Fragment, null, type === 1 ? /*#__PURE__*/React.createElement(Space, null, !showField || showField === 'logisticsCompany' ? /*#__PURE__*/React.createElement(ApaasLogistics, _objectSpread2(_objectSpread2({
11608
- type: logisticsType,
11607
+ }))) : null, value.length || type === 1 ? /*#__PURE__*/React.createElement(React.Fragment, null, type === 1 ? /*#__PURE__*/React.createElement(Space, null, !showField || showField === 'logisticsCompany' ? /*#__PURE__*/React.createElement(ApaasLogistics, {
11609
11608
  disabled: disabled,
11610
11609
  placeholder: "\u7269\u6D41\u516C\u53F8",
11611
11610
  onChange: function onChange(val) {
11612
- if (logisticsType === 'input') {
11613
- changeInputHandle(null, 'logisticsCompany');
11614
- changeInputHandle(val, 'logisticsCompanyName');
11615
- } else {
11616
- changeInputHandle(val, 'logisticsCompany');
11617
- }
11611
+ changeInputHandle(val, 'logisticsCompany');
11618
11612
  },
11619
- value: (_value$changeIndex = value[changeIndex]) === null || _value$changeIndex === void 0 ? void 0 : _value$changeIndex[logisticsType === 'input' ? 'logisticsCompanyName' : 'logisticsCompany']
11620
- }, logisticsType === 'input' ? {} : {
11613
+ value: platformType === 'gy' ? expressDateInstance.getExpressNameByCode((_value$changeIndex = value[changeIndex]) === null || _value$changeIndex === void 0 ? void 0 : _value$changeIndex['logisticsCompany'], false) || ((_value$changeIndex2 = value[changeIndex]) === null || _value$changeIndex2 === void 0 ? void 0 : _value$changeIndex2['logisticsCompanyName']) : (_value$changeIndex3 = value[changeIndex]) === null || _value$changeIndex3 === void 0 ? void 0 : _value$changeIndex3['logisticsCompany'],
11621
11614
  showSearch: true,
11622
11615
  dropdownMatchSelectWidth: false,
11623
11616
  filterOption: function filterOption(input, option) {
11624
11617
  return option.label.includes(input);
11625
- }
11626
- }), {}, {
11618
+ },
11627
11619
  style: {
11628
11620
  minWidth: '100px',
11629
11621
  maxWidth: '180px'
11630
11622
  },
11631
11623
  platformType: platformType
11632
- })) : null, !showField || showField === 'logisticsCode' ? /*#__PURE__*/React.createElement(Input, {
11624
+ }) : null, !showField || showField === 'logisticsCode' ? /*#__PURE__*/React.createElement(Input, {
11633
11625
  disabled: disabled,
11634
11626
  placeholder: "\u7269\u6D41\u5355\u53F7",
11635
11627
  onChange: function onChange(e) {
11636
11628
  return changeInputHandle(e.target.value, 'logisticsCode');
11637
11629
  },
11638
- value: (_value$changeIndex2 = value[changeIndex]) === null || _value$changeIndex2 === void 0 ? void 0 : _value$changeIndex2.logisticsCode
11630
+ value: (_value$changeIndex4 = value[changeIndex]) === null || _value$changeIndex4 === void 0 ? void 0 : _value$changeIndex4.logisticsCode
11639
11631
  }) : null) : null, type === 2 ? /*#__PURE__*/React.createElement(Space, null, ['supplyId', 'all'].includes(showField) && /*#__PURE__*/React.createElement(Input, {
11640
11632
  disabled: disabled,
11641
11633
  placeholder: "\u8BF7\u8F93\u5165\u4F9B\u9500\u5546\u7F16\u7801",
11642
11634
  onChange: function onChange(e) {
11643
11635
  return changeInputHandle(e.target.value, 'supplyId');
11644
11636
  },
11645
- value: (_value$changeIndex3 = value[changeIndex]) === null || _value$changeIndex3 === void 0 ? void 0 : _value$changeIndex3.supplyId
11637
+ value: (_value$changeIndex5 = value[changeIndex]) === null || _value$changeIndex5 === void 0 ? void 0 : _value$changeIndex5.supplyId
11646
11638
  }), ['supplyName', 'all'].includes(showField) && /*#__PURE__*/React.createElement(Input, {
11647
11639
  disabled: disabled,
11648
11640
  placeholder: "\u8BF7\u8F93\u5165\u4F9B\u9500\u5546\u540D\u79F0",
11649
11641
  onChange: function onChange(e) {
11650
11642
  return changeInputHandle(e.target.value, 'supplyName');
11651
11643
  },
11652
- value: (_value$changeIndex4 = value[changeIndex]) === null || _value$changeIndex4 === void 0 ? void 0 : _value$changeIndex4.supplyName
11644
+ value: (_value$changeIndex6 = value[changeIndex]) === null || _value$changeIndex6 === void 0 ? void 0 : _value$changeIndex6.supplyName
11653
11645
  })) : null, type === 3 ? /*#__PURE__*/React.createElement(Space, null, ['sendId', 'all'].includes(showField) && /*#__PURE__*/React.createElement(Input, {
11654
11646
  disabled: disabled,
11655
11647
  placeholder: "\u8BF7\u8F93\u5165\u53D1\u8D27\u4ED3\u7F16\u7801",
11656
11648
  onChange: function onChange(e) {
11657
11649
  return changeInputHandle(e.target.value, 'sendId');
11658
11650
  },
11659
- value: (_value$changeIndex5 = value[changeIndex]) === null || _value$changeIndex5 === void 0 ? void 0 : _value$changeIndex5.sendId
11651
+ value: (_value$changeIndex7 = value[changeIndex]) === null || _value$changeIndex7 === void 0 ? void 0 : _value$changeIndex7.sendId
11660
11652
  }), ['sendName', 'all'].includes(showField) && (isSelectName ? /*#__PURE__*/React.createElement(Select, {
11661
11653
  style: {
11662
11654
  minWidth: '100px',
@@ -11667,7 +11659,7 @@ var jstGoods = function jstGoods(props) {
11667
11659
  showSearch: true,
11668
11660
  options: sendOptions,
11669
11661
  filterOption: filterOption,
11670
- value: ((_value$changeIndex6 = value[changeIndex]) === null || _value$changeIndex6 === void 0 ? void 0 : _value$changeIndex6.sendSnapshotId) || ((_value$changeIndex7 = value[changeIndex]) === null || _value$changeIndex7 === void 0 ? void 0 : _value$changeIndex7.sendName) || null,
11662
+ value: ((_value$changeIndex8 = value[changeIndex]) === null || _value$changeIndex8 === void 0 ? void 0 : _value$changeIndex8.sendSnapshotId) || ((_value$changeIndex9 = value[changeIndex]) === null || _value$changeIndex9 === void 0 ? void 0 : _value$changeIndex9.sendName) || null,
11671
11663
  onChange: function onChange(value, option) {
11672
11664
  return handleSelected(value, 'sendName', option, onlyShowFieldSelect);
11673
11665
  }
@@ -11677,14 +11669,14 @@ var jstGoods = function jstGoods(props) {
11677
11669
  onChange: function onChange(e) {
11678
11670
  return changeInputHandle(e.target.value, 'sendName');
11679
11671
  },
11680
- value: (_value$changeIndex8 = value[changeIndex]) === null || _value$changeIndex8 === void 0 ? void 0 : _value$changeIndex8.sendName
11672
+ value: (_value$changeIndex10 = value[changeIndex]) === null || _value$changeIndex10 === void 0 ? void 0 : _value$changeIndex10.sendName
11681
11673
  }))) : null, type === 4 ? /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Input, {
11682
11674
  disabled: disabled,
11683
11675
  placeholder: "\u8BF7\u8F93\u5165\u51FA\u5E93\u5355\u7F16\u53F7",
11684
11676
  onChange: function onChange(e) {
11685
11677
  return changeInputHandle(e.target.value, 'deliveryNo');
11686
11678
  },
11687
- value: (_value$changeIndex9 = value[changeIndex]) === null || _value$changeIndex9 === void 0 ? void 0 : _value$changeIndex9.sendName
11679
+ value: (_value$changeIndex11 = value[changeIndex]) === null || _value$changeIndex11 === void 0 ? void 0 : _value$changeIndex11.sendName
11688
11680
  })) : null) : null);
11689
11681
  };
11690
11682
 
@@ -15942,6 +15934,7 @@ var GoodsModalMap = {
15942
15934
  BS_E3_EXCHANGE_GOODS: BsE3GoodsModal,
15943
15935
  GY_GOODS: GyGoodsModal$2,
15944
15936
  GY_REISSUE_GOODS: GyGoodsModal$2,
15937
+ GY_RETURN_GOODS: GyGoodsModal$2,
15945
15938
  JST_GOODS: JstGoodsModal,
15946
15939
  JST_REISSUE_GOODS: JstGoodsModal,
15947
15940
  JST_RETURN_GOODS: JstGoodsModal,
@@ -16014,7 +16007,7 @@ var getButtonText = function getButtonText() {
16014
16007
  if (['WDT_REISSUE_GOODS'].includes(type)) {
16015
16008
  return '选择旺店通商品';
16016
16009
  }
16017
- if (['GY_GOODS', 'GY_REISSUE_GOODS'].includes(type)) {
16010
+ if (['GY_GOODS', 'GY_REISSUE_GOODS', 'GY_RETURN_GOODS'].includes(type)) {
16018
16011
  return '选择管易ERP商品';
16019
16012
  }
16020
16013
  if (['JST_GOODS', 'JST_REISSUE_GOODS', 'JST_RETURN_GOODS', 'JST_EXCHANGE_GOODS'].includes(type)) {
@@ -16317,7 +16310,7 @@ var GoodItem$1 = function GoodItem(props) {
16317
16310
  canUpdateNumber: canUpdateNumber
16318
16311
  });
16319
16312
  });
16320
- } else if (['GY_GOODS', 'GY_REISSUE_GOODS'].includes(type)) {
16313
+ } else if (['GY_GOODS', 'GY_REISSUE_GOODS', 'GY_RETURN_GOODS'].includes(type)) {
16321
16314
  newList = list.map(function (item) {
16322
16315
  var goodName = item.goodName,
16323
16316
  goodShortName = item.goodShortName,
@@ -19880,7 +19873,7 @@ var typeMap$4 = {
19880
19873
  }
19881
19874
  };
19882
19875
  var GyReissue = function GyReissue(props) {
19883
- var _typeMap$type28, _typeMap$type30, _typeMap$type31, _value$typeMap$type$s5, _typeMap$type32, _typeMap$type33, _typeMap$type34;
19876
+ var _typeMap$type28, _typeMap$type29, _typeMap$type30, _systemOrder$orders, _typeMap$type31, _value$typeMap$type$s5, _typeMap$type32, _typeMap$type33, _typeMap$type34;
19884
19877
  var value = props.value,
19885
19878
  onChange = props.onChange,
19886
19879
  _props$reasonList = props.reasonList,
@@ -20052,10 +20045,9 @@ var GyReissue = function GyReissue(props) {
20052
20045
  pushGyLog('afterSelectedGoodsChange', newValue);
20053
20046
  }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type28 = typeMap$4[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.key)], isStrict]);
20054
20047
  //系统单选择后展示选择商品按钮，系统单未选择的时候不展示
20055
- var showChangeBtn = useMemo(function () {
20056
- var _typeMap$type29;
20057
- return !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type29 = typeMap$4[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.systemOrderNo]);
20058
- }, [value === null || value === void 0 ? void 0 : value[(_typeMap$type30 = typeMap$4[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.systemOrderNo]]);
20048
+ var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type29 = typeMap$4[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.systemOrder];
20049
+ var showChangeBtn = !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type30 = typeMap$4[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.systemOrderNo]);
20050
+ var showErpGoodsBtn = showChangeBtn || type === 'GY_REISSUE_GOODS' && systemOrder && systemOrder.orderNo && !((_systemOrder$orders = systemOrder.orders) === null || _systemOrder$orders === void 0 ? void 0 : _systemOrder$orders.length);
20059
20051
  return /*#__PURE__*/React.createElement("div", {
20060
20052
  id: "TEST_GY",
20061
20053
  onClick: function onClick() {
@@ -20115,6 +20107,8 @@ var GyReissue = function GyReissue(props) {
20115
20107
  disabled: disabled,
20116
20108
  canUpdateNumber: showChangeBtn,
20117
20109
  showChangeBtn: showChangeBtn,
20110
+ showErpGoodsBtn: showErpGoodsBtn,
20111
+ alwaysShowChooseErpGoodsBtn: showErpGoodsBtn,
20118
20112
  shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
20119
20113
  value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type34 = typeMap$4[type]) === null || _typeMap$type34 === void 0 ? void 0 : _typeMap$type34.key)],
20120
20114
  onChange: function onChange(val) {
@@ -20153,7 +20147,7 @@ var typeMap$5 = {
20153
20147
  }
20154
20148
  };
20155
20149
  var GyReturnGoods = function GyReturnGoods(props) {
20156
- var _typeMap$type10, _typeMap$type28, _typeMap$type29, _value$typeMap$type$s5, _typeMap$type30, _typeMap$type31, _typeMap$type32;
20150
+ var _typeMap$type10, _typeMap$type27, _systemOrder$orders, _typeMap$type28, _typeMap$type29, _value$typeMap$type$s5, _typeMap$type30, _typeMap$type31, _typeMap$type32;
20157
20151
  var value = props.value,
20158
20152
  onChange = props.onChange,
20159
20153
  _props$reasonList = props.reasonList,
@@ -20346,10 +20340,9 @@ var GyReturnGoods = function GyReturnGoods(props) {
20346
20340
  }))));
20347
20341
  };
20348
20342
  //系统单选择后展示选择商品按钮，系统单未选择的时候不展示
20349
- var showChangeBtn = useMemo(function () {
20350
- var _typeMap$type27;
20351
- return !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type27 = typeMap$5[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.systemOrderNo]);
20352
- }, [value === null || value === void 0 ? void 0 : value[(_typeMap$type28 = typeMap$5[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.systemOrderNo]]);
20343
+ var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type27 = typeMap$5[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.systemOrder];
20344
+ var showErpGoodsBtn = type === 'GY_RETURN_GOODS' && systemOrder && systemOrder.orderNo && !((_systemOrder$orders = systemOrder.orders) === null || _systemOrder$orders === void 0 ? void 0 : _systemOrder$orders.length);
20345
+ var showChangeBtn = !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type28 = typeMap$5[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.systemOrderNo]);
20353
20346
  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Row, {
20354
20347
  gutter: 8,
20355
20348
  wrap: true
@@ -20411,7 +20404,8 @@ var GyReturnGoods = function GyReturnGoods(props) {
20411
20404
  },
20412
20405
  onModeChange: handleModeChange,
20413
20406
  isStrict: isStrict,
20414
- showErpGoodsBtn: false,
20407
+ showErpGoodsBtn: showErpGoodsBtn,
20408
+ alwaysShowChooseErpGoodsBtn: showErpGoodsBtn,
20415
20409
  tradeGoods: {
20416
20410
  originDataSource: getGoodDetails({
20417
20411
  mode: isStrict
package/dist/index.js CHANGED
@@ -11514,7 +11514,7 @@ var typeInitValueMap = {
11514
11514
  }]
11515
11515
  };
11516
11516
  var jstGoods = function jstGoods(props) {
11517
- var _value$changeIndex, _value$changeIndex2, _value$changeIndex3, _value$changeIndex4, _value$changeIndex5, _value$changeIndex6, _value$changeIndex7, _value$changeIndex8, _value$changeIndex9;
11517
+ var _value$changeIndex, _value$changeIndex2, _value$changeIndex3, _value$changeIndex4, _value$changeIndex5, _value$changeIndex6, _value$changeIndex7, _value$changeIndex8, _value$changeIndex9, _value$changeIndex10, _value$changeIndex11;
11518
11518
  var _props$value = props.value,
11519
11519
  value = _props$value === void 0 ? [] : _props$value,
11520
11520
  onChange = props.onChange,
@@ -11532,8 +11532,8 @@ var jstGoods = function jstGoods(props) {
11532
11532
  setChangeIndex = _useState2[1]; //选中的包裹
11533
11533
  var sendOptions = kmkfUtils.SendDataCenter.getInstance(platformType).getSendData();
11534
11534
  var isSelectName = ['wdt', 'bsE3', 'km', 'gy', 'jst'].includes(platformType);
11535
+ var expressDateInstance = kmkfUtils.ExpressData.getInstance(platformType);
11535
11536
  var isSendGoodSavedId = isSelectName && !['jst'].includes(platformType);
11536
- var logisticsType = type === 1 && platformType === 'gy' ? 'input' : 'select';
11537
11537
  React.useEffect(function () {
11538
11538
  //没有值塞个默认值
11539
11539
  if (!(value === null || value === void 0 ? void 0 : value.length) && type !== 1) {
@@ -11616,59 +11616,51 @@ var jstGoods = function jstGoods(props) {
11616
11616
  return setChangeIndex(index);
11617
11617
  }
11618
11618
  }, "\u5305\u88F9".concat(index + 1)));
11619
- }))) : null, value.length || type === 1 ? /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, type === 1 ? /*#__PURE__*/React__default['default'].createElement(antd.Space, null, !showField || showField === 'logisticsCompany' ? /*#__PURE__*/React__default['default'].createElement(ApaasLogistics, _objectSpread2(_objectSpread2({
11620
- type: logisticsType,
11619
+ }))) : null, value.length || type === 1 ? /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, type === 1 ? /*#__PURE__*/React__default['default'].createElement(antd.Space, null, !showField || showField === 'logisticsCompany' ? /*#__PURE__*/React__default['default'].createElement(ApaasLogistics, {
11621
11620
  disabled: disabled,
11622
11621
  placeholder: "\u7269\u6D41\u516C\u53F8",
11623
11622
  onChange: function onChange(val) {
11624
- if (logisticsType === 'input') {
11625
- changeInputHandle(null, 'logisticsCompany');
11626
- changeInputHandle(val, 'logisticsCompanyName');
11627
- } else {
11628
- changeInputHandle(val, 'logisticsCompany');
11629
- }
11623
+ changeInputHandle(val, 'logisticsCompany');
11630
11624
  },
11631
- value: (_value$changeIndex = value[changeIndex]) === null || _value$changeIndex === void 0 ? void 0 : _value$changeIndex[logisticsType === 'input' ? 'logisticsCompanyName' : 'logisticsCompany']
11632
- }, logisticsType === 'input' ? {} : {
11625
+ value: platformType === 'gy' ? expressDateInstance.getExpressNameByCode((_value$changeIndex = value[changeIndex]) === null || _value$changeIndex === void 0 ? void 0 : _value$changeIndex['logisticsCompany'], false) || ((_value$changeIndex2 = value[changeIndex]) === null || _value$changeIndex2 === void 0 ? void 0 : _value$changeIndex2['logisticsCompanyName']) : (_value$changeIndex3 = value[changeIndex]) === null || _value$changeIndex3 === void 0 ? void 0 : _value$changeIndex3['logisticsCompany'],
11633
11626
  showSearch: true,
11634
11627
  dropdownMatchSelectWidth: false,
11635
11628
  filterOption: function filterOption(input, option) {
11636
11629
  return option.label.includes(input);
11637
- }
11638
- }), {}, {
11630
+ },
11639
11631
  style: {
11640
11632
  minWidth: '100px',
11641
11633
  maxWidth: '180px'
11642
11634
  },
11643
11635
  platformType: platformType
11644
- })) : null, !showField || showField === 'logisticsCode' ? /*#__PURE__*/React__default['default'].createElement(antd.Input, {
11636
+ }) : null, !showField || showField === 'logisticsCode' ? /*#__PURE__*/React__default['default'].createElement(antd.Input, {
11645
11637
  disabled: disabled,
11646
11638
  placeholder: "\u7269\u6D41\u5355\u53F7",
11647
11639
  onChange: function onChange(e) {
11648
11640
  return changeInputHandle(e.target.value, 'logisticsCode');
11649
11641
  },
11650
- value: (_value$changeIndex2 = value[changeIndex]) === null || _value$changeIndex2 === void 0 ? void 0 : _value$changeIndex2.logisticsCode
11642
+ value: (_value$changeIndex4 = value[changeIndex]) === null || _value$changeIndex4 === void 0 ? void 0 : _value$changeIndex4.logisticsCode
11651
11643
  }) : null) : null, type === 2 ? /*#__PURE__*/React__default['default'].createElement(antd.Space, null, ['supplyId', 'all'].includes(showField) && /*#__PURE__*/React__default['default'].createElement(antd.Input, {
11652
11644
  disabled: disabled,
11653
11645
  placeholder: "\u8BF7\u8F93\u5165\u4F9B\u9500\u5546\u7F16\u7801",
11654
11646
  onChange: function onChange(e) {
11655
11647
  return changeInputHandle(e.target.value, 'supplyId');
11656
11648
  },
11657
- value: (_value$changeIndex3 = value[changeIndex]) === null || _value$changeIndex3 === void 0 ? void 0 : _value$changeIndex3.supplyId
11649
+ value: (_value$changeIndex5 = value[changeIndex]) === null || _value$changeIndex5 === void 0 ? void 0 : _value$changeIndex5.supplyId
11658
11650
  }), ['supplyName', 'all'].includes(showField) && /*#__PURE__*/React__default['default'].createElement(antd.Input, {
11659
11651
  disabled: disabled,
11660
11652
  placeholder: "\u8BF7\u8F93\u5165\u4F9B\u9500\u5546\u540D\u79F0",
11661
11653
  onChange: function onChange(e) {
11662
11654
  return changeInputHandle(e.target.value, 'supplyName');
11663
11655
  },
11664
- value: (_value$changeIndex4 = value[changeIndex]) === null || _value$changeIndex4 === void 0 ? void 0 : _value$changeIndex4.supplyName
11656
+ value: (_value$changeIndex6 = value[changeIndex]) === null || _value$changeIndex6 === void 0 ? void 0 : _value$changeIndex6.supplyName
11665
11657
  })) : null, type === 3 ? /*#__PURE__*/React__default['default'].createElement(antd.Space, null, ['sendId', 'all'].includes(showField) && /*#__PURE__*/React__default['default'].createElement(antd.Input, {
11666
11658
  disabled: disabled,
11667
11659
  placeholder: "\u8BF7\u8F93\u5165\u53D1\u8D27\u4ED3\u7F16\u7801",
11668
11660
  onChange: function onChange(e) {
11669
11661
  return changeInputHandle(e.target.value, 'sendId');
11670
11662
  },
11671
- value: (_value$changeIndex5 = value[changeIndex]) === null || _value$changeIndex5 === void 0 ? void 0 : _value$changeIndex5.sendId
11663
+ value: (_value$changeIndex7 = value[changeIndex]) === null || _value$changeIndex7 === void 0 ? void 0 : _value$changeIndex7.sendId
11672
11664
  }), ['sendName', 'all'].includes(showField) && (isSelectName ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
11673
11665
  style: {
11674
11666
  minWidth: '100px',
@@ -11679,7 +11671,7 @@ var jstGoods = function jstGoods(props) {
11679
11671
  showSearch: true,
11680
11672
  options: sendOptions,
11681
11673
  filterOption: filterOption,
11682
- value: ((_value$changeIndex6 = value[changeIndex]) === null || _value$changeIndex6 === void 0 ? void 0 : _value$changeIndex6.sendSnapshotId) || ((_value$changeIndex7 = value[changeIndex]) === null || _value$changeIndex7 === void 0 ? void 0 : _value$changeIndex7.sendName) || null,
11674
+ value: ((_value$changeIndex8 = value[changeIndex]) === null || _value$changeIndex8 === void 0 ? void 0 : _value$changeIndex8.sendSnapshotId) || ((_value$changeIndex9 = value[changeIndex]) === null || _value$changeIndex9 === void 0 ? void 0 : _value$changeIndex9.sendName) || null,
11683
11675
  onChange: function onChange(value, option) {
11684
11676
  return handleSelected(value, 'sendName', option, onlyShowFieldSelect);
11685
11677
  }
@@ -11689,14 +11681,14 @@ var jstGoods = function jstGoods(props) {
11689
11681
  onChange: function onChange(e) {
11690
11682
  return changeInputHandle(e.target.value, 'sendName');
11691
11683
  },
11692
- value: (_value$changeIndex8 = value[changeIndex]) === null || _value$changeIndex8 === void 0 ? void 0 : _value$changeIndex8.sendName
11684
+ value: (_value$changeIndex10 = value[changeIndex]) === null || _value$changeIndex10 === void 0 ? void 0 : _value$changeIndex10.sendName
11693
11685
  }))) : null, type === 4 ? /*#__PURE__*/React__default['default'].createElement(antd.Space, null, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
11694
11686
  disabled: disabled,
11695
11687
  placeholder: "\u8BF7\u8F93\u5165\u51FA\u5E93\u5355\u7F16\u53F7",
11696
11688
  onChange: function onChange(e) {
11697
11689
  return changeInputHandle(e.target.value, 'deliveryNo');
11698
11690
  },
11699
- value: (_value$changeIndex9 = value[changeIndex]) === null || _value$changeIndex9 === void 0 ? void 0 : _value$changeIndex9.sendName
11691
+ value: (_value$changeIndex11 = value[changeIndex]) === null || _value$changeIndex11 === void 0 ? void 0 : _value$changeIndex11.sendName
11700
11692
  })) : null) : null);
11701
11693
  };
11702
11694
 
@@ -15954,6 +15946,7 @@ var GoodsModalMap = {
15954
15946
  BS_E3_EXCHANGE_GOODS: BsE3GoodsModal,
15955
15947
  GY_GOODS: GyGoodsModal$2,
15956
15948
  GY_REISSUE_GOODS: GyGoodsModal$2,
15949
+ GY_RETURN_GOODS: GyGoodsModal$2,
15957
15950
  JST_GOODS: JstGoodsModal,
15958
15951
  JST_REISSUE_GOODS: JstGoodsModal,
15959
15952
  JST_RETURN_GOODS: JstGoodsModal,
@@ -16026,7 +16019,7 @@ var getButtonText = function getButtonText() {
16026
16019
  if (['WDT_REISSUE_GOODS'].includes(type)) {
16027
16020
  return '选择旺店通商品';
16028
16021
  }
16029
- if (['GY_GOODS', 'GY_REISSUE_GOODS'].includes(type)) {
16022
+ if (['GY_GOODS', 'GY_REISSUE_GOODS', 'GY_RETURN_GOODS'].includes(type)) {
16030
16023
  return '选择管易ERP商品';
16031
16024
  }
16032
16025
  if (['JST_GOODS', 'JST_REISSUE_GOODS', 'JST_RETURN_GOODS', 'JST_EXCHANGE_GOODS'].includes(type)) {
@@ -16329,7 +16322,7 @@ var GoodItem$1 = function GoodItem(props) {
16329
16322
  canUpdateNumber: canUpdateNumber
16330
16323
  });
16331
16324
  });
16332
- } else if (['GY_GOODS', 'GY_REISSUE_GOODS'].includes(type)) {
16325
+ } else if (['GY_GOODS', 'GY_REISSUE_GOODS', 'GY_RETURN_GOODS'].includes(type)) {
16333
16326
  newList = list.map(function (item) {
16334
16327
  var goodName = item.goodName,
16335
16328
  goodShortName = item.goodShortName,
@@ -19892,7 +19885,7 @@ var typeMap$4 = {
19892
19885
  }
19893
19886
  };
19894
19887
  var GyReissue = function GyReissue(props) {
19895
- var _typeMap$type28, _typeMap$type30, _typeMap$type31, _value$typeMap$type$s5, _typeMap$type32, _typeMap$type33, _typeMap$type34;
19888
+ var _typeMap$type28, _typeMap$type29, _typeMap$type30, _systemOrder$orders, _typeMap$type31, _value$typeMap$type$s5, _typeMap$type32, _typeMap$type33, _typeMap$type34;
19896
19889
  var value = props.value,
19897
19890
  onChange = props.onChange,
19898
19891
  _props$reasonList = props.reasonList,
@@ -20064,10 +20057,9 @@ var GyReissue = function GyReissue(props) {
20064
20057
  kmkfUtils.pushGyLog('afterSelectedGoodsChange', newValue);
20065
20058
  }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type28 = typeMap$4[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.key)], isStrict]);
20066
20059
  //系统单选择后展示选择商品按钮，系统单未选择的时候不展示
20067
- var showChangeBtn = React.useMemo(function () {
20068
- var _typeMap$type29;
20069
- return !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type29 = typeMap$4[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.systemOrderNo]);
20070
- }, [value === null || value === void 0 ? void 0 : value[(_typeMap$type30 = typeMap$4[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.systemOrderNo]]);
20060
+ var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type29 = typeMap$4[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.systemOrder];
20061
+ var showChangeBtn = !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type30 = typeMap$4[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.systemOrderNo]);
20062
+ var showErpGoodsBtn = showChangeBtn || type === 'GY_REISSUE_GOODS' && systemOrder && systemOrder.orderNo && !((_systemOrder$orders = systemOrder.orders) === null || _systemOrder$orders === void 0 ? void 0 : _systemOrder$orders.length);
20071
20063
  return /*#__PURE__*/React__default['default'].createElement("div", {
20072
20064
  id: "TEST_GY",
20073
20065
  onClick: function onClick() {
@@ -20127,6 +20119,8 @@ var GyReissue = function GyReissue(props) {
20127
20119
  disabled: disabled,
20128
20120
  canUpdateNumber: showChangeBtn,
20129
20121
  showChangeBtn: showChangeBtn,
20122
+ showErpGoodsBtn: showErpGoodsBtn,
20123
+ alwaysShowChooseErpGoodsBtn: showErpGoodsBtn,
20130
20124
  shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
20131
20125
  value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type34 = typeMap$4[type]) === null || _typeMap$type34 === void 0 ? void 0 : _typeMap$type34.key)],
20132
20126
  onChange: function onChange(val) {
@@ -20165,7 +20159,7 @@ var typeMap$5 = {
20165
20159
  }
20166
20160
  };
20167
20161
  var GyReturnGoods = function GyReturnGoods(props) {
20168
- var _typeMap$type10, _typeMap$type28, _typeMap$type29, _value$typeMap$type$s5, _typeMap$type30, _typeMap$type31, _typeMap$type32;
20162
+ var _typeMap$type10, _typeMap$type27, _systemOrder$orders, _typeMap$type28, _typeMap$type29, _value$typeMap$type$s5, _typeMap$type30, _typeMap$type31, _typeMap$type32;
20169
20163
  var value = props.value,
20170
20164
  onChange = props.onChange,
20171
20165
  _props$reasonList = props.reasonList,
@@ -20358,10 +20352,9 @@ var GyReturnGoods = function GyReturnGoods(props) {
20358
20352
  }))));
20359
20353
  };
20360
20354
  //系统单选择后展示选择商品按钮，系统单未选择的时候不展示
20361
- var showChangeBtn = React.useMemo(function () {
20362
- var _typeMap$type27;
20363
- return !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type27 = typeMap$5[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.systemOrderNo]);
20364
- }, [value === null || value === void 0 ? void 0 : value[(_typeMap$type28 = typeMap$5[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.systemOrderNo]]);
20355
+ var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type27 = typeMap$5[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.systemOrder];
20356
+ var showErpGoodsBtn = type === 'GY_RETURN_GOODS' && systemOrder && systemOrder.orderNo && !((_systemOrder$orders = systemOrder.orders) === null || _systemOrder$orders === void 0 ? void 0 : _systemOrder$orders.length);
20357
+ var showChangeBtn = !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type28 = typeMap$5[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.systemOrderNo]);
20365
20358
  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Row, {
20366
20359
  gutter: 8,
20367
20360
  wrap: true
@@ -20423,7 +20416,8 @@ var GyReturnGoods = function GyReturnGoods(props) {
20423
20416
  },
20424
20417
  onModeChange: handleModeChange,
20425
20418
  isStrict: isStrict,
20426
- showErpGoodsBtn: false,
20419
+ showErpGoodsBtn: showErpGoodsBtn,
20420
+ alwaysShowChooseErpGoodsBtn: showErpGoodsBtn,
20427
20421
  tradeGoods: {
20428
20422
  originDataSource: getGoodDetails({
20429
20423
  mode: isStrict
package/dist/src/jst/Goods/index.d.ts CHANGED
@@ -1,4 +1,5 @@
1
1
  import React from 'react';
2
+ import { ExpressData } from '@kmkf-fe-packages/kmkf-utils';
2
3
  interface JstGoodsProps {
3
4
  value: any[];
4
5
  type: number;
@@ -8,6 +9,7 @@ interface JstGoodsProps {
8
9
  showField: string;
9
10
  platformType?: string;
10
11
  onlyShowFieldSelect: boolean;
12
+ expressDateInstance: InstanceType<typeof ExpressData>;
11
13
  }
12
14
  declare const jstGoods: (props: Partial<JstGoodsProps>) => React.JSX.Element;
13
15
  export default jstGoods;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/basic-components",
3
- "version": "2.0.54-beta.4",
3
+ "version": "2.0.54-beta.7",
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": "2.0.54-beta.2",
23
+ "@kmkf-fe-packages/kmkf-utils": "2.0.54-beta.5",
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": "e7d6b28e01b8ab248864b050a3f826ee873125fa"
68
+ "gitHead": "f75935f605b3cbf433d08f5f54babf4eccd95958"
69
69
  }