@kmkf-fe-packages/basic-components 2.2.44-beta.4 → 2.2.44-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 (3) hide show
  1. package/dist/index.esm.js +46 -27
  2. package/dist/index.js +45 -26
  3. package/package.json +3 -3
package/dist/index.esm.js CHANGED
@@ -3,7 +3,7 @@ import { Cascader, DatePicker, Image, InputNumber, Input, Select, Upload, messag
3
3
  import { EyeOutlined, DeleteOutlined, CloseOutlined, PlusSquareOutlined, MinusCircleFilled, PlusCircleFilled, CopyOutlined, CloseCircleOutlined, CaretUpOutlined, UpOutlined, DownOutlined, PlusOutlined, VideoCameraTwoTone } 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, GyAddressData, JstAddressData, request as request$1, ExpressData, isNull, imgResize, uuid, servers, columnsGoodsList, LogisticsAddressData, SendDataCenter, hasAddNullComponent, SUBMIT_TIME_ID, UPGRADE_TIME_ID, FINAL_TIME_ID, CUSTOM_TIME_ID, useStatus, finalFormData, transformList, dataSourceTrans, DATA_SPLIT_COMPONENT_FIELDS_MAP, findLabelBySelectValue, BS_E3_BOOLEAN_STATUS_MAP, filterWdtOrders, WDT_ORDER_TYPE_MAP, tradeStatusMap, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, filterJstOrders, filterJyOrders, JY_ORDER_TYPE_MAP, JY_ORDER_STATUS_MAP, filterJkyOrders, JKY_ORDER_TYPE_MAP, JKY_ORDER_STATUS_MAP, filterKmOrders, getSystemShowHead, getIsPlatformCodesIncludeOrderNos, BS_SYSTEM_ORDER_CONFIG, KM_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, JST_SYSTEM_ORDER_CONFIG, JY_SYSTEM_ORDER_CONFIG, JKY_SYSTEM_ORDER_CONFIG, WDT_RETURN_BILL_NO_CONFIG, updateOrderSubFormGoodsHandle, updateWlnGoodsHandle, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, updateKmGoodsHandle, updateJyGoodsHandle, updateJkyGoodsHandle, updateWdtAftersaleGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog, skxSystemOrderBackValues, skxReturnSystemOrderBackValues, formatTrade, updateSkxGoodsHandle, formatReturnTrade, updateSkxReturnGoodsHandle } from '@kmkf-fe-packages/kmkf-utils';
6
+ import { AddressData, BsAddressData, WdtAddressData, GyAddressData, JstAddressData, JkyAddressData, request as request$1, ExpressData, isNull, imgResize, uuid, servers, columnsGoodsList, LogisticsAddressData, SendDataCenter, kmSkuTypeMap, hasAddNullComponent, SUBMIT_TIME_ID, UPGRADE_TIME_ID, FINAL_TIME_ID, CUSTOM_TIME_ID, useStatus, finalFormData, transformList, dataSourceTrans, DATA_SPLIT_COMPONENT_FIELDS_MAP, findLabelBySelectValue, BS_E3_BOOLEAN_STATUS_MAP, filterWdtOrders, WDT_ORDER_TYPE_MAP, tradeStatusMap, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, filterJstOrders, filterJyOrders, JY_ORDER_TYPE_MAP, JY_ORDER_STATUS_MAP, filterJkyOrders, JKY_ORDER_TYPE_MAP, JKY_ORDER_STATUS_MAP, filterKmOrders, getSystemShowHead, getIsPlatformCodesIncludeOrderNos, BS_SYSTEM_ORDER_CONFIG, KM_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, JST_SYSTEM_ORDER_CONFIG, JY_SYSTEM_ORDER_CONFIG, JKY_SYSTEM_ORDER_CONFIG, WDT_RETURN_BILL_NO_CONFIG, updateOrderSubFormGoodsHandle, updateWlnGoodsHandle, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, updateKmGoodsHandle, updateJyGoodsHandle, updateJkyGoodsHandle, updateWdtAftersaleGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog, skxSystemOrderBackValues, skxReturnSystemOrderBackValues, formatTrade, updateSkxGoodsHandle, formatReturnTrade, updateSkxReturnGoodsHandle } from '@kmkf-fe-packages/kmkf-utils';
7
7
  import every from 'lodash/every';
8
8
  import maxBy from 'lodash/maxBy';
9
9
  import { debounce, isNaN as isNaN$1, isNumber as isNumber$1, uniqBy, cloneDeep, difference, differenceWith, isBoolean, isEqual, takeRight, reject as reject$1, intersection, isEmpty } from 'lodash';
@@ -7758,7 +7758,8 @@ var Province = function Province(props) {
7758
7758
  wdt: WdtAddressData.getInstance(),
7759
7759
  gy: GyAddressData.getInstance(),
7760
7760
  km: AddressData.getInstance(),
7761
- jst: JstAddressData.getInstance()
7761
+ jst: JstAddressData.getInstance(),
7762
+ jky: JkyAddressData.getInstance()
7762
7763
  };
7763
7764
  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Cascader, _objectSpread2(_objectSpread2({}, props), {}, {
7764
7765
  options: ((_mapping$type = mapping[type]) === null || _mapping$type === void 0 ? void 0 : _mapping$type.addressOptions) || [],
@@ -15087,12 +15088,7 @@ var kmColumns = [{
15087
15088
  ellipsis: true,
15088
15089
  width: 150,
15089
15090
  render: function render(type) {
15090
- return renderTextEllipsis({
15091
- 0: '普通',
15092
- 1: 'sku套件',
15093
- 2: '纯套件',
15094
- 3: '包材商品'
15095
- }[type] || type);
15091
+ return renderTextEllipsis((kmSkuTypeMap === null || kmSkuTypeMap === void 0 ? void 0 : kmSkuTypeMap[type]) || type);
15096
15092
  }
15097
15093
  }, {
15098
15094
  dataIndex: 'specName',
@@ -22425,7 +22421,7 @@ var getColumns$9 = function getColumns(_ref) {
22425
22421
  updateHandle = _ref.updateHandle,
22426
22422
  updateDataHandle = _ref.updateDataHandle;
22427
22423
  return {
22428
- //巨益商品信息
22424
+ //吉客云商品信息
22429
22425
  JKY_GOODS: [{
22430
22426
  dataIndex: 'goodsNo',
22431
22427
  title: "\u8D27\u54C1\u7F16\u53F7",
@@ -22723,7 +22719,7 @@ var getColumns$9 = function getColumns(_ref) {
22723
22719
  ellipsis: true
22724
22720
  });
22725
22721
  }),
22726
- // 巨益补发商品信息
22722
+ // 吉客云补发商品信息
22727
22723
  JKY_REISSUE_GOODS: [{
22728
22724
  dataIndex: 'goodsNo',
22729
22725
  title: "\u8D27\u54C1\u7F16\u53F7",
@@ -22794,7 +22790,7 @@ var getColumns$9 = function getColumns(_ref) {
22794
22790
  }
22795
22791
  },
22796
22792
  render: function render(val, record, index) {
22797
- return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
22793
+ return !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
22798
22794
  style: {
22799
22795
  width: 70
22800
22796
  },
@@ -22814,7 +22810,7 @@ var getColumns$9 = function getColumns(_ref) {
22814
22810
  title: "\u5355\u4EF7",
22815
22811
  width: 150,
22816
22812
  render: function render(val, record, index) {
22817
- return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
22813
+ return !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
22818
22814
  style: {
22819
22815
  width: 130
22820
22816
  },
@@ -22834,25 +22830,28 @@ var getColumns$9 = function getColumns(_ref) {
22834
22830
  title: "\u603B\u91D1\u989D",
22835
22831
  width: 150,
22836
22832
  render: function render(val, record, index) {
22837
- return record.sellCount * record.sellPrice;
22833
+ if ((typeof record.sellCount === 'number' || record.sellCount) && (typeof record.sellPrice === 'number' || record.sellPrice)) {
22834
+ return record.sellCount * record.sellPrice;
22835
+ }
22836
+ return '';
22838
22837
  }
22839
22838
  }, {
22840
22839
  dataIndex: 'reason',
22841
22840
  title: "\u9000\u6362\u539F\u56E0",
22842
22841
  width: 250,
22843
22842
  render: function render(val, record, index) {
22844
- return /*#__PURE__*/React.createElement(ApaasInput, {
22843
+ return !disabled ? /*#__PURE__*/React.createElement(ApaasInput, {
22845
22844
  onChange: function onChange(value) {
22846
22845
  updateHandle(value, index, 'reason');
22847
22846
  }
22848
- });
22847
+ }) : /*#__PURE__*/React.createElement("span", null, val);
22849
22848
  }
22850
22849
  }, {
22851
22850
  dataIndex: 'isGift',
22852
22851
  title: "\u662F\u5426\u8D60\u54C1",
22853
22852
  width: 150,
22854
22853
  render: function render(val, record, index) {
22855
- return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(Select, {
22854
+ return !disabled ? /*#__PURE__*/React.createElement(Select, {
22856
22855
  value: val,
22857
22856
  onChange: function onChange(value) {
22858
22857
  updateHandle(value, index, 'isGift');
@@ -22871,7 +22870,7 @@ var getColumns$9 = function getColumns(_ref) {
22871
22870
  title: "\u662F\u5426\u7EC4\u5408\u88C5",
22872
22871
  width: 150,
22873
22872
  render: function render(val, record, index) {
22874
- return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(Select, {
22873
+ return !disabled ? /*#__PURE__*/React.createElement(Select, {
22875
22874
  value: val,
22876
22875
  onChange: function onChange(value) {
22877
22876
  updateHandle(value, index, 'isFit');
@@ -23447,7 +23446,7 @@ var processKmGoods$1 = function processKmGoods(_ref7) {
23447
23446
  sysPicPath: item.goodPicUrl,
23448
23447
  payment: null,
23449
23448
  price: item.retailPrice,
23450
- type: null,
23449
+ type: (kmSkuTypeMap === null || kmSkuTypeMap === void 0 ? void 0 : kmSkuTypeMap[item === null || item === void 0 ? void 0 : item.skuType]) || '',
23451
23450
  uuid: uuid(),
23452
23451
  canDelete: true,
23453
23452
  canEdit: true
@@ -23810,7 +23809,7 @@ var GoodItem$1 = function GoodItem(props) {
23810
23809
  var isShowSelectTradeGoods = type !== 'JST_EXCHANGE_GOODS' || (jstReturnGoods === null || jstReturnGoods === void 0 ? void 0 : jstReturnGoods.jstSystemOrderNo);
23811
23810
  // 判断是否为是否展示系统单筛选项
23812
23811
  var isShowSelect = type && ['WDT_GOODS', 'BS_E3_GOODS', 'GY_GOODS', 'JST_GOODS', 'WLN_GOODS', 'KM_GOODS', 'JY_GOODS', 'JY_REISSUE_GOODS', 'JKY_GOODS', 'JKY_REISSUE_GOODS', 'GY_REISSUE_GOODS', 'KM_REISSUE_GOODS', 'BS_E3_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'JST_REISSUE_GOODS'].includes(type) || false;
23813
- var isReissueType = type && ['GY_REISSUE_GOODS', 'KM_REISSUE_GOODS', 'BS_E3_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'JST_REISSUE_GOODS', 'JY_REISSUE_GOODS'].includes(type) || false;
23812
+ var isReissueType = type && ['GY_REISSUE_GOODS', 'KM_REISSUE_GOODS', 'BS_E3_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'JST_REISSUE_GOODS', 'JY_REISSUE_GOODS', 'JKY_REISSUE_GOODS'].includes(type) || false;
23814
23813
  var refModal = useRef();
23815
23814
  console.debug('表格数据', value);
23816
23815
  var handleDelete = function handleDelete(record, index) {
@@ -25115,7 +25114,7 @@ var getJkyOrderListSingleton = function getJkyOrderListSingleton(orderNo) {
25115
25114
  singletonMap$7.delete(orderNo);
25116
25115
  reject(err);
25117
25116
  };
25118
- extendRequest('/qy/gdfw/order/jkyOrderDetail', {
25117
+ extendRequest('/qy/gdfw/jky/erp/trade/fullInfo', {
25119
25118
  method: 'post',
25120
25119
  data: {
25121
25120
  billNo: orderNo
@@ -27845,10 +27844,26 @@ var typeMap$2 = {
27845
27844
  outerOiIdKey: '',
27846
27845
  goodDetailsKey: 'subOrderDetails',
27847
27846
  isShowSelectTradeGoods: true
27847
+ },
27848
+ JKY_REISSUE_GOODS: {
27849
+ compType: '补发',
27850
+ key: 'jkyReissueGoods',
27851
+ typeName: 'jkyReissueType',
27852
+ systemOrder: 'jkySystemOrder',
27853
+ systemOrderNo: 'jkySystemOrderNo',
27854
+ getOrderList: jkyUtils.getJkyOrderListSingleton,
27855
+ updateGoodsHandle: updateJkyGoodsHandle,
27856
+ alwaysShowChooseErpGoodsBtn: true,
27857
+ orderTypeKey: 'orderType',
27858
+ oIdKey: 'tradeNo',
27859
+ outerOiIdKey: '',
27860
+ goodDetailsKey: 'subOrderDetails',
27861
+ isShowSelectTradeGoods: true,
27862
+ showModeBtn: true
27848
27863
  }
27849
27864
  };
27850
27865
  var PublicReissue = function PublicReissue(props) {
27851
- var _typeMap$type36, _typeMap$type42, _typeMap$type43, _typeMap$type44, _typeMap$type45, _value$typeMap$type$s8, _typeMap$type46, _typeMap$type47, _typeMap$type48, _typeMap$type49, _typeMap$type50, _typeMap$type51, _typeMap$type52, _value$typeMap$type$s9, _typeMap$type53, _typeMap$type54, _typeMap$type55, _typeMap$type56;
27866
+ var _typeMap$type36, _typeMap$type42, _typeMap$type43, _typeMap$type44, _typeMap$type45, _value$typeMap$type$s8, _typeMap$type46, _typeMap$type47, _typeMap$type48, _typeMap$type49, _typeMap$type50, _typeMap$type51, _typeMap$type52, _typeMap$type53, _value$typeMap$type$s9, _typeMap$type54, _typeMap$type55, _typeMap$type56, _typeMap$type57;
27852
27867
  var value = props.value,
27853
27868
  onChange = props.onChange,
27854
27869
  _props$reasonList = props.reasonList,
@@ -28070,6 +28085,10 @@ var PublicReissue = function PublicReissue(props) {
28070
28085
  orderRest = {
28071
28086
  canEdit: true
28072
28087
  };
28088
+ } else if (['JKY_REISSUE_GOODS'].includes(type)) {
28089
+ orderRest = {
28090
+ canEdit: true
28091
+ };
28073
28092
  }
28074
28093
  var orders = isAllOrders ? (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s6 = value[(_typeMap$type20 = typeMap$2[type]) === null || _typeMap$type20 === void 0 ? void 0 : _typeMap$type20.systemOrder]) === null || _value$typeMap$type$s6 === void 0 ? void 0 : _value$typeMap$type$s6.orders) || [] : order ? [order] : [];
28075
28094
  var hasGoodDetails = orders === null || orders === void 0 ? void 0 : orders.some(function (order) {
@@ -28211,17 +28230,17 @@ var PublicReissue = function PublicReissue(props) {
28211
28230
  return changeGoodHandle(val);
28212
28231
  },
28213
28232
  onModeChange: handleModeChange,
28214
- showModeBtn: false,
28233
+ showModeBtn: !!(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type52 = typeMap$2[type]) === null || _typeMap$type52 === void 0 ? void 0 : _typeMap$type52.showModeBtn),
28215
28234
  isStrict: isStrict,
28216
- isShowSelectTradeGoods: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type52 = typeMap$2[type]) === null || _typeMap$type52 === void 0 ? void 0 : _typeMap$type52.isShowSelectTradeGoods,
28217
- systemOrders: value === null || value === void 0 ? void 0 : (_value$typeMap$type$s9 = value[(_typeMap$type53 = typeMap$2[type]) === null || _typeMap$type53 === void 0 ? void 0 : _typeMap$type53.systemOrder]) === null || _value$typeMap$type$s9 === void 0 ? void 0 : _value$typeMap$type$s9.orders,
28218
- selectedSystemOrders: showChangeBtn ? [value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type54 = typeMap$2[type]) === null || _typeMap$type54 === void 0 ? void 0 : _typeMap$type54.systemOrderNo)]] : [],
28235
+ isShowSelectTradeGoods: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type53 = typeMap$2[type]) === null || _typeMap$type53 === void 0 ? void 0 : _typeMap$type53.isShowSelectTradeGoods,
28236
+ systemOrders: value === null || value === void 0 ? void 0 : (_value$typeMap$type$s9 = value[(_typeMap$type54 = typeMap$2[type]) === null || _typeMap$type54 === void 0 ? void 0 : _typeMap$type54.systemOrder]) === null || _value$typeMap$type$s9 === void 0 ? void 0 : _value$typeMap$type$s9.orders,
28237
+ selectedSystemOrders: showChangeBtn ? [value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type55 = typeMap$2[type]) === null || _typeMap$type55 === void 0 ? void 0 : _typeMap$type55.systemOrderNo)]] : [],
28219
28238
  tradeGoods: {
28220
28239
  originDataSource: getGoodDetails({
28221
28240
  mode: isStrict,
28222
- isAllOrders: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type55 = typeMap$2[type]) === null || _typeMap$type55 === void 0 ? void 0 : _typeMap$type55.isShowSelectTradeGoods
28241
+ isAllOrders: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type56 = typeMap$2[type]) === null || _typeMap$type56 === void 0 ? void 0 : _typeMap$type56.isShowSelectTradeGoods
28223
28242
  }),
28224
- uniqueKey: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type56 = typeMap$2[type]) === null || _typeMap$type56 === void 0 ? void 0 : _typeMap$type56.uniqueKey) || 'uuid',
28243
+ uniqueKey: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type57 = typeMap$2[type]) === null || _typeMap$type57 === void 0 ? void 0 : _typeMap$type57.uniqueKey) || 'uuid',
28225
28244
  selectedGoodsChange: selectedGoodsChange
28226
28245
  }
28227
28246
  })));
package/dist/index.js CHANGED
@@ -7773,7 +7773,8 @@ var Province = function Province(props) {
7773
7773
  wdt: kmkfUtils.WdtAddressData.getInstance(),
7774
7774
  gy: kmkfUtils.GyAddressData.getInstance(),
7775
7775
  km: kmkfUtils.AddressData.getInstance(),
7776
- jst: kmkfUtils.JstAddressData.getInstance()
7776
+ jst: kmkfUtils.JstAddressData.getInstance(),
7777
+ jky: kmkfUtils.JkyAddressData.getInstance()
7777
7778
  };
7778
7779
  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Cascader, _objectSpread2(_objectSpread2({}, props), {}, {
7779
7780
  options: ((_mapping$type = mapping[type]) === null || _mapping$type === void 0 ? void 0 : _mapping$type.addressOptions) || [],
@@ -15102,12 +15103,7 @@ var kmColumns = [{
15102
15103
  ellipsis: true,
15103
15104
  width: 150,
15104
15105
  render: function render(type) {
15105
- return renderTextEllipsis({
15106
- 0: '普通',
15107
- 1: 'sku套件',
15108
- 2: '纯套件',
15109
- 3: '包材商品'
15110
- }[type] || type);
15106
+ return renderTextEllipsis((kmkfUtils.kmSkuTypeMap === null || kmkfUtils.kmSkuTypeMap === void 0 ? void 0 : kmkfUtils.kmSkuTypeMap[type]) || type);
15111
15107
  }
15112
15108
  }, {
15113
15109
  dataIndex: 'specName',
@@ -22440,7 +22436,7 @@ var getColumns$9 = function getColumns(_ref) {
22440
22436
  updateHandle = _ref.updateHandle,
22441
22437
  updateDataHandle = _ref.updateDataHandle;
22442
22438
  return {
22443
- //巨益商品信息
22439
+ //吉客云商品信息
22444
22440
  JKY_GOODS: [{
22445
22441
  dataIndex: 'goodsNo',
22446
22442
  title: "\u8D27\u54C1\u7F16\u53F7",
@@ -22738,7 +22734,7 @@ var getColumns$9 = function getColumns(_ref) {
22738
22734
  ellipsis: true
22739
22735
  });
22740
22736
  }),
22741
- // 巨益补发商品信息
22737
+ // 吉客云补发商品信息
22742
22738
  JKY_REISSUE_GOODS: [{
22743
22739
  dataIndex: 'goodsNo',
22744
22740
  title: "\u8D27\u54C1\u7F16\u53F7",
@@ -22809,7 +22805,7 @@ var getColumns$9 = function getColumns(_ref) {
22809
22805
  }
22810
22806
  },
22811
22807
  render: function render(val, record, index) {
22812
- return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
22808
+ return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
22813
22809
  style: {
22814
22810
  width: 70
22815
22811
  },
@@ -22829,7 +22825,7 @@ var getColumns$9 = function getColumns(_ref) {
22829
22825
  title: "\u5355\u4EF7",
22830
22826
  width: 150,
22831
22827
  render: function render(val, record, index) {
22832
- return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
22828
+ return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
22833
22829
  style: {
22834
22830
  width: 130
22835
22831
  },
@@ -22849,25 +22845,28 @@ var getColumns$9 = function getColumns(_ref) {
22849
22845
  title: "\u603B\u91D1\u989D",
22850
22846
  width: 150,
22851
22847
  render: function render(val, record, index) {
22852
- return record.sellCount * record.sellPrice;
22848
+ if ((typeof record.sellCount === 'number' || record.sellCount) && (typeof record.sellPrice === 'number' || record.sellPrice)) {
22849
+ return record.sellCount * record.sellPrice;
22850
+ }
22851
+ return '';
22853
22852
  }
22854
22853
  }, {
22855
22854
  dataIndex: 'reason',
22856
22855
  title: "\u9000\u6362\u539F\u56E0",
22857
22856
  width: 250,
22858
22857
  render: function render(val, record, index) {
22859
- return /*#__PURE__*/React__default['default'].createElement(ApaasInput, {
22858
+ return !disabled ? /*#__PURE__*/React__default['default'].createElement(ApaasInput, {
22860
22859
  onChange: function onChange(value) {
22861
22860
  updateHandle(value, index, 'reason');
22862
22861
  }
22863
- });
22862
+ }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
22864
22863
  }
22865
22864
  }, {
22866
22865
  dataIndex: 'isGift',
22867
22866
  title: "\u662F\u5426\u8D60\u54C1",
22868
22867
  width: 150,
22869
22868
  render: function render(val, record, index) {
22870
- return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
22869
+ return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
22871
22870
  value: val,
22872
22871
  onChange: function onChange(value) {
22873
22872
  updateHandle(value, index, 'isGift');
@@ -22886,7 +22885,7 @@ var getColumns$9 = function getColumns(_ref) {
22886
22885
  title: "\u662F\u5426\u7EC4\u5408\u88C5",
22887
22886
  width: 150,
22888
22887
  render: function render(val, record, index) {
22889
- return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
22888
+ return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
22890
22889
  value: val,
22891
22890
  onChange: function onChange(value) {
22892
22891
  updateHandle(value, index, 'isFit');
@@ -23462,7 +23461,7 @@ var processKmGoods$1 = function processKmGoods(_ref7) {
23462
23461
  sysPicPath: item.goodPicUrl,
23463
23462
  payment: null,
23464
23463
  price: item.retailPrice,
23465
- type: null,
23464
+ type: (kmkfUtils.kmSkuTypeMap === null || kmkfUtils.kmSkuTypeMap === void 0 ? void 0 : kmkfUtils.kmSkuTypeMap[item === null || item === void 0 ? void 0 : item.skuType]) || '',
23466
23465
  uuid: kmkfUtils.uuid(),
23467
23466
  canDelete: true,
23468
23467
  canEdit: true
@@ -23825,7 +23824,7 @@ var GoodItem$1 = function GoodItem(props) {
23825
23824
  var isShowSelectTradeGoods = type !== 'JST_EXCHANGE_GOODS' || (jstReturnGoods === null || jstReturnGoods === void 0 ? void 0 : jstReturnGoods.jstSystemOrderNo);
23826
23825
  // 判断是否为是否展示系统单筛选项
23827
23826
  var isShowSelect = type && ['WDT_GOODS', 'BS_E3_GOODS', 'GY_GOODS', 'JST_GOODS', 'WLN_GOODS', 'KM_GOODS', 'JY_GOODS', 'JY_REISSUE_GOODS', 'JKY_GOODS', 'JKY_REISSUE_GOODS', 'GY_REISSUE_GOODS', 'KM_REISSUE_GOODS', 'BS_E3_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'JST_REISSUE_GOODS'].includes(type) || false;
23828
- var isReissueType = type && ['GY_REISSUE_GOODS', 'KM_REISSUE_GOODS', 'BS_E3_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'JST_REISSUE_GOODS', 'JY_REISSUE_GOODS'].includes(type) || false;
23827
+ var isReissueType = type && ['GY_REISSUE_GOODS', 'KM_REISSUE_GOODS', 'BS_E3_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'JST_REISSUE_GOODS', 'JY_REISSUE_GOODS', 'JKY_REISSUE_GOODS'].includes(type) || false;
23829
23828
  var refModal = React.useRef();
23830
23829
  console.debug('表格数据', value);
23831
23830
  var handleDelete = function handleDelete(record, index) {
@@ -25130,7 +25129,7 @@ var getJkyOrderListSingleton = function getJkyOrderListSingleton(orderNo) {
25130
25129
  singletonMap$7.delete(orderNo);
25131
25130
  reject(err);
25132
25131
  };
25133
- extendRequest('/qy/gdfw/order/jkyOrderDetail', {
25132
+ extendRequest('/qy/gdfw/jky/erp/trade/fullInfo', {
25134
25133
  method: 'post',
25135
25134
  data: {
25136
25135
  billNo: orderNo
@@ -27860,10 +27859,26 @@ var typeMap$2 = {
27860
27859
  outerOiIdKey: '',
27861
27860
  goodDetailsKey: 'subOrderDetails',
27862
27861
  isShowSelectTradeGoods: true
27862
+ },
27863
+ JKY_REISSUE_GOODS: {
27864
+ compType: '补发',
27865
+ key: 'jkyReissueGoods',
27866
+ typeName: 'jkyReissueType',
27867
+ systemOrder: 'jkySystemOrder',
27868
+ systemOrderNo: 'jkySystemOrderNo',
27869
+ getOrderList: jkyUtils.getJkyOrderListSingleton,
27870
+ updateGoodsHandle: kmkfUtils.updateJkyGoodsHandle,
27871
+ alwaysShowChooseErpGoodsBtn: true,
27872
+ orderTypeKey: 'orderType',
27873
+ oIdKey: 'tradeNo',
27874
+ outerOiIdKey: '',
27875
+ goodDetailsKey: 'subOrderDetails',
27876
+ isShowSelectTradeGoods: true,
27877
+ showModeBtn: true
27863
27878
  }
27864
27879
  };
27865
27880
  var PublicReissue = function PublicReissue(props) {
27866
- var _typeMap$type36, _typeMap$type42, _typeMap$type43, _typeMap$type44, _typeMap$type45, _value$typeMap$type$s8, _typeMap$type46, _typeMap$type47, _typeMap$type48, _typeMap$type49, _typeMap$type50, _typeMap$type51, _typeMap$type52, _value$typeMap$type$s9, _typeMap$type53, _typeMap$type54, _typeMap$type55, _typeMap$type56;
27881
+ var _typeMap$type36, _typeMap$type42, _typeMap$type43, _typeMap$type44, _typeMap$type45, _value$typeMap$type$s8, _typeMap$type46, _typeMap$type47, _typeMap$type48, _typeMap$type49, _typeMap$type50, _typeMap$type51, _typeMap$type52, _typeMap$type53, _value$typeMap$type$s9, _typeMap$type54, _typeMap$type55, _typeMap$type56, _typeMap$type57;
27867
27882
  var value = props.value,
27868
27883
  onChange = props.onChange,
27869
27884
  _props$reasonList = props.reasonList,
@@ -28085,6 +28100,10 @@ var PublicReissue = function PublicReissue(props) {
28085
28100
  orderRest = {
28086
28101
  canEdit: true
28087
28102
  };
28103
+ } else if (['JKY_REISSUE_GOODS'].includes(type)) {
28104
+ orderRest = {
28105
+ canEdit: true
28106
+ };
28088
28107
  }
28089
28108
  var orders = isAllOrders ? (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s6 = value[(_typeMap$type20 = typeMap$2[type]) === null || _typeMap$type20 === void 0 ? void 0 : _typeMap$type20.systemOrder]) === null || _value$typeMap$type$s6 === void 0 ? void 0 : _value$typeMap$type$s6.orders) || [] : order ? [order] : [];
28090
28109
  var hasGoodDetails = orders === null || orders === void 0 ? void 0 : orders.some(function (order) {
@@ -28226,17 +28245,17 @@ var PublicReissue = function PublicReissue(props) {
28226
28245
  return changeGoodHandle(val);
28227
28246
  },
28228
28247
  onModeChange: handleModeChange,
28229
- showModeBtn: false,
28248
+ showModeBtn: !!(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type52 = typeMap$2[type]) === null || _typeMap$type52 === void 0 ? void 0 : _typeMap$type52.showModeBtn),
28230
28249
  isStrict: isStrict,
28231
- isShowSelectTradeGoods: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type52 = typeMap$2[type]) === null || _typeMap$type52 === void 0 ? void 0 : _typeMap$type52.isShowSelectTradeGoods,
28232
- systemOrders: value === null || value === void 0 ? void 0 : (_value$typeMap$type$s9 = value[(_typeMap$type53 = typeMap$2[type]) === null || _typeMap$type53 === void 0 ? void 0 : _typeMap$type53.systemOrder]) === null || _value$typeMap$type$s9 === void 0 ? void 0 : _value$typeMap$type$s9.orders,
28233
- selectedSystemOrders: showChangeBtn ? [value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type54 = typeMap$2[type]) === null || _typeMap$type54 === void 0 ? void 0 : _typeMap$type54.systemOrderNo)]] : [],
28250
+ isShowSelectTradeGoods: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type53 = typeMap$2[type]) === null || _typeMap$type53 === void 0 ? void 0 : _typeMap$type53.isShowSelectTradeGoods,
28251
+ systemOrders: value === null || value === void 0 ? void 0 : (_value$typeMap$type$s9 = value[(_typeMap$type54 = typeMap$2[type]) === null || _typeMap$type54 === void 0 ? void 0 : _typeMap$type54.systemOrder]) === null || _value$typeMap$type$s9 === void 0 ? void 0 : _value$typeMap$type$s9.orders,
28252
+ selectedSystemOrders: showChangeBtn ? [value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type55 = typeMap$2[type]) === null || _typeMap$type55 === void 0 ? void 0 : _typeMap$type55.systemOrderNo)]] : [],
28234
28253
  tradeGoods: {
28235
28254
  originDataSource: getGoodDetails({
28236
28255
  mode: isStrict,
28237
- isAllOrders: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type55 = typeMap$2[type]) === null || _typeMap$type55 === void 0 ? void 0 : _typeMap$type55.isShowSelectTradeGoods
28256
+ isAllOrders: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type56 = typeMap$2[type]) === null || _typeMap$type56 === void 0 ? void 0 : _typeMap$type56.isShowSelectTradeGoods
28238
28257
  }),
28239
- uniqueKey: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type56 = typeMap$2[type]) === null || _typeMap$type56 === void 0 ? void 0 : _typeMap$type56.uniqueKey) || 'uuid',
28258
+ uniqueKey: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type57 = typeMap$2[type]) === null || _typeMap$type57 === void 0 ? void 0 : _typeMap$type57.uniqueKey) || 'uuid',
28240
28259
  selectedGoodsChange: selectedGoodsChange
28241
28260
  }
28242
28261
  })));
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/basic-components",
3
- "version": "2.2.44-beta.4",
3
+ "version": "2.2.44-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.2.44-beta.4",
23
+ "@kmkf-fe-packages/kmkf-utils": "2.2.44-beta.7",
24
24
  "ahooks": "^3.7.4",
25
25
  "ali-react-table": "2.6.1",
26
26
  "bignumber.js": "^9.1.2",
@@ -66,5 +66,5 @@
66
66
  "publishConfig": {
67
67
  "access": "public"
68
68
  },
69
- "gitHead": "6f7a39c27b7121eb64d357d4f346c7168b1febaf"
69
+ "gitHead": "778709de50065058b408b81d293558d121295930"
70
70
  }