@kmkf-fe-packages/basic-components 2.2.44-beta.2 → 2.2.44-beta.22

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 +61 -29
  2. package/dist/index.js +60 -28
  3. package/dist/src/bs/component/model/Columns/Erp/km.d.ts +6 -0
  4. 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) || [],
@@ -8605,7 +8606,8 @@ var processSceneStatus = function processSceneStatus(getValue) {
8605
8606
  WAREHOUSING_STATUS: 'inStockStatusItemList',
8606
8607
  BS_E3_WAREHOUSING_STATUS: 'bsE3InStockStatusItemList',
8607
8608
  MSG_STATUS: 'msgStatusValues',
8608
- WDT_WAREHOUSING_STATUS: 'wdtInStockStatusItemList'
8609
+ WDT_WAREHOUSING_STATUS: 'wdtInStockStatusItemList',
8610
+ JKY_WAREHOUSING_STATUS: 'jkyInStockStatusItemList'
8609
8611
  };
8610
8612
  return _defineProperty({}, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_").concat(STATUS_LIST_MAP[nex.workOrderComponentType])), []));
8611
8613
  };
@@ -9360,6 +9362,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
9360
9362
  BS_E3_WAREHOUSING_STATUS: processSceneStatus,
9361
9363
  MSG_STATUS: processSceneStatus,
9362
9364
  WDT_WAREHOUSING_STATUS: processSceneStatus,
9365
+ JKY_WAREHOUSING_STATUS: processSceneStatus,
9363
9366
  BS_LOGISTICS: processErpLogistics,
9364
9367
  WLN_LOGISTICS: processErpLogistics,
9365
9368
  WDT_LOGISTICS: processErpLogistics,
@@ -15086,7 +15089,9 @@ var kmColumns = [{
15086
15089
  title: "\u5546\u54C1\u7C7B\u578B",
15087
15090
  ellipsis: true,
15088
15091
  width: 150,
15089
- render: renderTextEllipsis
15092
+ render: function render(type) {
15093
+ return renderTextEllipsis((kmSkuTypeMap === null || kmSkuTypeMap === void 0 ? void 0 : kmSkuTypeMap[type]) || type);
15094
+ }
15090
15095
  }, {
15091
15096
  dataIndex: 'specName',
15092
15097
  title: "SKU\u540D\u79F0",
@@ -22418,7 +22423,7 @@ var getColumns$9 = function getColumns(_ref) {
22418
22423
  updateHandle = _ref.updateHandle,
22419
22424
  updateDataHandle = _ref.updateDataHandle;
22420
22425
  return {
22421
- //巨益商品信息
22426
+ //吉客云商品信息
22422
22427
  JKY_GOODS: [{
22423
22428
  dataIndex: 'goodsNo',
22424
22429
  title: "\u8D27\u54C1\u7F16\u53F7",
@@ -22716,7 +22721,7 @@ var getColumns$9 = function getColumns(_ref) {
22716
22721
  ellipsis: true
22717
22722
  });
22718
22723
  }),
22719
- // 巨益补发商品信息
22724
+ // 吉客云补发商品信息
22720
22725
  JKY_REISSUE_GOODS: [{
22721
22726
  dataIndex: 'goodsNo',
22722
22727
  title: "\u8D27\u54C1\u7F16\u53F7",
@@ -22787,7 +22792,7 @@ var getColumns$9 = function getColumns(_ref) {
22787
22792
  }
22788
22793
  },
22789
22794
  render: function render(val, record, index) {
22790
- return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
22795
+ return !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
22791
22796
  style: {
22792
22797
  width: 70
22793
22798
  },
@@ -22807,7 +22812,7 @@ var getColumns$9 = function getColumns(_ref) {
22807
22812
  title: "\u5355\u4EF7",
22808
22813
  width: 150,
22809
22814
  render: function render(val, record, index) {
22810
- return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
22815
+ return !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
22811
22816
  style: {
22812
22817
  width: 130
22813
22818
  },
@@ -22827,25 +22832,28 @@ var getColumns$9 = function getColumns(_ref) {
22827
22832
  title: "\u603B\u91D1\u989D",
22828
22833
  width: 150,
22829
22834
  render: function render(val, record, index) {
22830
- return record.sellCount * record.sellPrice;
22835
+ if ((typeof record.sellCount === 'number' || record.sellCount) && (typeof record.sellPrice === 'number' || record.sellPrice)) {
22836
+ return record.sellCount * record.sellPrice;
22837
+ }
22838
+ return '';
22831
22839
  }
22832
22840
  }, {
22833
22841
  dataIndex: 'reason',
22834
22842
  title: "\u9000\u6362\u539F\u56E0",
22835
22843
  width: 250,
22836
22844
  render: function render(val, record, index) {
22837
- return /*#__PURE__*/React.createElement(ApaasInput, {
22845
+ return !disabled ? /*#__PURE__*/React.createElement(ApaasInput, {
22838
22846
  onChange: function onChange(value) {
22839
22847
  updateHandle(value, index, 'reason');
22840
22848
  }
22841
- });
22849
+ }) : /*#__PURE__*/React.createElement("span", null, val);
22842
22850
  }
22843
22851
  }, {
22844
22852
  dataIndex: 'isGift',
22845
22853
  title: "\u662F\u5426\u8D60\u54C1",
22846
22854
  width: 150,
22847
22855
  render: function render(val, record, index) {
22848
- return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(Select, {
22856
+ return !disabled ? /*#__PURE__*/React.createElement(Select, {
22849
22857
  value: val,
22850
22858
  onChange: function onChange(value) {
22851
22859
  updateHandle(value, index, 'isGift');
@@ -22864,7 +22872,7 @@ var getColumns$9 = function getColumns(_ref) {
22864
22872
  title: "\u662F\u5426\u7EC4\u5408\u88C5",
22865
22873
  width: 150,
22866
22874
  render: function render(val, record, index) {
22867
- return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(Select, {
22875
+ return !disabled ? /*#__PURE__*/React.createElement(Select, {
22868
22876
  value: val,
22869
22877
  onChange: function onChange(value) {
22870
22878
  updateHandle(value, index, 'isFit');
@@ -23436,11 +23444,13 @@ var processKmGoods$1 = function processKmGoods(_ref7) {
23436
23444
  sysOuterId: item.goodNo,
23437
23445
  outerId: item.goodNo,
23438
23446
  skuSysId: item.specId,
23447
+ sysSkuId: item.specId,
23439
23448
  itemSysId: item.goodId,
23449
+ sysItemId: item.goodId,
23440
23450
  sysPicPath: item.goodPicUrl,
23441
23451
  payment: null,
23442
23452
  price: item.retailPrice,
23443
- type: null,
23453
+ type: (kmSkuTypeMap === null || kmSkuTypeMap === void 0 ? void 0 : kmSkuTypeMap[item === null || item === void 0 ? void 0 : item.skuType]) || '',
23444
23454
  uuid: uuid(),
23445
23455
  canDelete: true,
23446
23456
  canEdit: true
@@ -23555,7 +23565,7 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
23555
23565
  systemItemIds = dataSource === null || dataSource === void 0 ? void 0 : dataSource.filter(function (item) {
23556
23566
  return item === null || item === void 0 ? void 0 : item.sysItemId;
23557
23567
  }).map(function (item) {
23558
- return (item === null || item === void 0 ? void 0 : item.sysSkuId) == '-1' ? item === null || item === void 0 ? void 0 : item.sysItemId : "".concat(item === null || item === void 0 ? void 0 : item.sysItemId, "-").concat(item === null || item === void 0 ? void 0 : item.sysSkuId);
23568
+ return !(item === null || item === void 0 ? void 0 : item.sysSkuId) || (item === null || item === void 0 ? void 0 : item.sysSkuId) == '-1' || (item === null || item === void 0 ? void 0 : item.sysSkuId) == (item === null || item === void 0 ? void 0 : item.sysItemId) ? item === null || item === void 0 ? void 0 : item.sysItemId : "".concat(item === null || item === void 0 ? void 0 : item.sysItemId, "-").concat(item === null || item === void 0 ? void 0 : item.sysSkuId);
23559
23569
  });
23560
23570
  _context.next = 3;
23561
23571
  return servers.KM.getSupplierSingleton(systemItemIds);
@@ -23564,7 +23574,7 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
23564
23574
  dataSource === null || dataSource === void 0 ? void 0 : (_dataSource$filter = dataSource.filter(function (item) {
23565
23575
  return item === null || item === void 0 ? void 0 : item.sysItemId;
23566
23576
  })) === null || _dataSource$filter === void 0 ? void 0 : _dataSource$filter.forEach(function (item) {
23567
- var key = (item === null || item === void 0 ? void 0 : item.sysSkuId) == '-1' ? item === null || item === void 0 ? void 0 : item.sysItemId : "".concat(item === null || item === void 0 ? void 0 : item.sysItemId, "-").concat(item === null || item === void 0 ? void 0 : item.sysSkuId);
23577
+ var key = !(item === null || item === void 0 ? void 0 : item.sysSkuId) || (item === null || item === void 0 ? void 0 : item.sysSkuId) == '-1' || (item === null || item === void 0 ? void 0 : item.sysSkuId) == (item === null || item === void 0 ? void 0 : item.sysItemId) ? item === null || item === void 0 ? void 0 : item.sysItemId : "".concat(item === null || item === void 0 ? void 0 : item.sysItemId, "-").concat(item === null || item === void 0 ? void 0 : item.sysSkuId);
23568
23578
  var supplierInfo = supplierMap.get(key);
23569
23579
  item.supplierCode = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierCode;
23570
23580
  item.supplierName = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierName;
@@ -23803,7 +23813,7 @@ var GoodItem$1 = function GoodItem(props) {
23803
23813
  var isShowSelectTradeGoods = type !== 'JST_EXCHANGE_GOODS' || (jstReturnGoods === null || jstReturnGoods === void 0 ? void 0 : jstReturnGoods.jstSystemOrderNo);
23804
23814
  // 判断是否为是否展示系统单筛选项
23805
23815
  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;
23806
- 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;
23816
+ 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;
23807
23817
  var refModal = useRef();
23808
23818
  console.debug('表格数据', value);
23809
23819
  var handleDelete = function handleDelete(record, index) {
@@ -25108,7 +25118,7 @@ var getJkyOrderListSingleton = function getJkyOrderListSingleton(orderNo) {
25108
25118
  singletonMap$7.delete(orderNo);
25109
25119
  reject(err);
25110
25120
  };
25111
- extendRequest('/qy/gdfw/order/jkyOrderDetail', {
25121
+ extendRequest('/qy/gdfw/jky/erp/trade/fullInfo', {
25112
25122
  method: 'post',
25113
25123
  data: {
25114
25124
  billNo: orderNo
@@ -26826,7 +26836,7 @@ var CommonGoods = function CommonGoods(props) {
26826
26836
  value === null || value === void 0 ? void 0 : (_value$kmGoods = value.kmGoods) === null || _value$kmGoods === void 0 ? void 0 : (_value$kmGoods$filter = _value$kmGoods.filter(function (item) {
26827
26837
  return item === null || item === void 0 ? void 0 : item.sysItemId;
26828
26838
  })) === null || _value$kmGoods$filter === void 0 ? void 0 : _value$kmGoods$filter.forEach(function (item) {
26829
- var key = item.sysSkuId == '-1' ? item.sysItemId : "".concat(item.sysItemId, "-").concat(item.sysSkuId);
26839
+ var key = !(item === null || item === void 0 ? void 0 : item.sysSkuId) || (item === null || item === void 0 ? void 0 : item.sysSkuId) == '-1' || (item === null || item === void 0 ? void 0 : item.sysSkuId) == (item === null || item === void 0 ? void 0 : item.sysItemId) ? item === null || item === void 0 ? void 0 : item.sysItemId : "".concat(item === null || item === void 0 ? void 0 : item.sysItemId, "-").concat(item === null || item === void 0 ? void 0 : item.sysSkuId);
26830
26840
  map[key] = item;
26831
26841
  });
26832
26842
  }
@@ -26867,7 +26877,8 @@ var CommonGoods = function CommonGoods(props) {
26867
26877
  hasChange = false;
26868
26878
  currentValue = valueRef.current;
26869
26879
  kmGoods = currentValue === null || currentValue === void 0 ? void 0 : (_currentValue$kmGoods = currentValue.kmGoods) === null || _currentValue$kmGoods === void 0 ? void 0 : _currentValue$kmGoods.map(function (item) {
26870
- var supplierInfo = supplierMap.get(item.sysItemId);
26880
+ var key = !(item === null || item === void 0 ? void 0 : item.sysSkuId) || (item === null || item === void 0 ? void 0 : item.sysSkuId) == '-1' || (item === null || item === void 0 ? void 0 : item.sysSkuId) == (item === null || item === void 0 ? void 0 : item.sysItemId) ? item === null || item === void 0 ? void 0 : item.sysItemId : "".concat(item === null || item === void 0 ? void 0 : item.sysItemId, "-").concat(item === null || item === void 0 ? void 0 : item.sysSkuId);
26881
+ var supplierInfo = supplierMap.get(key);
26871
26882
  var newSupplierCode = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierCode;
26872
26883
  var newSupplierName = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierName;
26873
26884
  // 如果供应商信息有变化，标记需要更新
@@ -27838,10 +27849,26 @@ var typeMap$2 = {
27838
27849
  outerOiIdKey: '',
27839
27850
  goodDetailsKey: 'subOrderDetails',
27840
27851
  isShowSelectTradeGoods: true
27852
+ },
27853
+ JKY_REISSUE_GOODS: {
27854
+ compType: '补发',
27855
+ key: 'jkyReissueGoods',
27856
+ typeName: 'jkyReissueType',
27857
+ systemOrder: 'jkySystemOrder',
27858
+ systemOrderNo: 'jkySystemOrderNo',
27859
+ getOrderList: jkyUtils.getJkyOrderListSingleton,
27860
+ updateGoodsHandle: updateJkyGoodsHandle,
27861
+ alwaysShowChooseErpGoodsBtn: true,
27862
+ orderTypeKey: 'orderType',
27863
+ oIdKey: 'tradeNo',
27864
+ outerOiIdKey: '',
27865
+ goodDetailsKey: 'subOrderDetails',
27866
+ isShowSelectTradeGoods: true,
27867
+ showModeBtn: true
27841
27868
  }
27842
27869
  };
27843
27870
  var PublicReissue = function PublicReissue(props) {
27844
- 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;
27871
+ 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;
27845
27872
  var value = props.value,
27846
27873
  onChange = props.onChange,
27847
27874
  _props$reasonList = props.reasonList,
@@ -27964,7 +27991,7 @@ var PublicReissue = function PublicReissue(props) {
27964
27991
  value === null || value === void 0 ? void 0 : (_value$kmReissueGoods = value.kmReissueGoods) === null || _value$kmReissueGoods === void 0 ? void 0 : (_value$kmReissueGoods2 = _value$kmReissueGoods.filter(function (item) {
27965
27992
  return item === null || item === void 0 ? void 0 : item.sysItemId;
27966
27993
  })) === null || _value$kmReissueGoods2 === void 0 ? void 0 : _value$kmReissueGoods2.forEach(function (item) {
27967
- var key = item.sysSkuId == '-1' ? item.sysItemId : "".concat(item.sysItemId, "-").concat(item.sysSkuId);
27994
+ var key = !(item === null || item === void 0 ? void 0 : item.sysSkuId) || (item === null || item === void 0 ? void 0 : item.sysSkuId) == '-1' || (item === null || item === void 0 ? void 0 : item.sysSkuId) == (item === null || item === void 0 ? void 0 : item.sysItemId) ? item === null || item === void 0 ? void 0 : item.sysItemId : "".concat(item === null || item === void 0 ? void 0 : item.sysItemId, "-").concat(item === null || item === void 0 ? void 0 : item.sysSkuId);
27968
27995
  map[key] = item;
27969
27996
  });
27970
27997
  }
@@ -28005,7 +28032,8 @@ var PublicReissue = function PublicReissue(props) {
28005
28032
  hasChange = false;
28006
28033
  currentValue = valueRef.current;
28007
28034
  kmReissueGoods = currentValue === null || currentValue === void 0 ? void 0 : (_currentValue$kmReiss = currentValue.kmReissueGoods) === null || _currentValue$kmReiss === void 0 ? void 0 : _currentValue$kmReiss.map(function (item) {
28008
- var supplierInfo = supplierMap.get(item.sysItemId);
28035
+ var key = !(item === null || item === void 0 ? void 0 : item.sysSkuId) || (item === null || item === void 0 ? void 0 : item.sysSkuId) == '-1' || (item === null || item === void 0 ? void 0 : item.sysSkuId) == (item === null || item === void 0 ? void 0 : item.sysItemId) ? item === null || item === void 0 ? void 0 : item.sysItemId : "".concat(item === null || item === void 0 ? void 0 : item.sysItemId, "-").concat(item === null || item === void 0 ? void 0 : item.sysSkuId);
28036
+ var supplierInfo = supplierMap.get(key);
28009
28037
  var newSupplierCode = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierCode;
28010
28038
  var newSupplierName = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierName;
28011
28039
  // 如果供应商信息有变化，标记需要更新
@@ -28063,6 +28091,10 @@ var PublicReissue = function PublicReissue(props) {
28063
28091
  orderRest = {
28064
28092
  canEdit: true
28065
28093
  };
28094
+ } else if (['JKY_REISSUE_GOODS'].includes(type)) {
28095
+ orderRest = {
28096
+ canEdit: true
28097
+ };
28066
28098
  }
28067
28099
  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] : [];
28068
28100
  var hasGoodDetails = orders === null || orders === void 0 ? void 0 : orders.some(function (order) {
@@ -28204,17 +28236,17 @@ var PublicReissue = function PublicReissue(props) {
28204
28236
  return changeGoodHandle(val);
28205
28237
  },
28206
28238
  onModeChange: handleModeChange,
28207
- showModeBtn: false,
28239
+ 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),
28208
28240
  isStrict: isStrict,
28209
- 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,
28210
- 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,
28211
- 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)]] : [],
28241
+ 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,
28242
+ 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,
28243
+ 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)]] : [],
28212
28244
  tradeGoods: {
28213
28245
  originDataSource: getGoodDetails({
28214
28246
  mode: isStrict,
28215
- 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
28247
+ 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
28216
28248
  }),
28217
- 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',
28249
+ 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',
28218
28250
  selectedGoodsChange: selectedGoodsChange
28219
28251
  }
28220
28252
  })));
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) || [],
@@ -8620,7 +8621,8 @@ var processSceneStatus = function processSceneStatus(getValue) {
8620
8621
  WAREHOUSING_STATUS: 'inStockStatusItemList',
8621
8622
  BS_E3_WAREHOUSING_STATUS: 'bsE3InStockStatusItemList',
8622
8623
  MSG_STATUS: 'msgStatusValues',
8623
- WDT_WAREHOUSING_STATUS: 'wdtInStockStatusItemList'
8624
+ WDT_WAREHOUSING_STATUS: 'wdtInStockStatusItemList',
8625
+ JKY_WAREHOUSING_STATUS: 'jkyInStockStatusItemList'
8624
8626
  };
8625
8627
  return _defineProperty({}, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_").concat(STATUS_LIST_MAP[nex.workOrderComponentType])), []));
8626
8628
  };
@@ -9375,6 +9377,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
9375
9377
  BS_E3_WAREHOUSING_STATUS: processSceneStatus,
9376
9378
  MSG_STATUS: processSceneStatus,
9377
9379
  WDT_WAREHOUSING_STATUS: processSceneStatus,
9380
+ JKY_WAREHOUSING_STATUS: processSceneStatus,
9378
9381
  BS_LOGISTICS: processErpLogistics,
9379
9382
  WLN_LOGISTICS: processErpLogistics,
9380
9383
  WDT_LOGISTICS: processErpLogistics,
@@ -15101,7 +15104,9 @@ var kmColumns = [{
15101
15104
  title: "\u5546\u54C1\u7C7B\u578B",
15102
15105
  ellipsis: true,
15103
15106
  width: 150,
15104
- render: renderTextEllipsis
15107
+ render: function render(type) {
15108
+ return renderTextEllipsis((kmkfUtils.kmSkuTypeMap === null || kmkfUtils.kmSkuTypeMap === void 0 ? void 0 : kmkfUtils.kmSkuTypeMap[type]) || type);
15109
+ }
15105
15110
  }, {
15106
15111
  dataIndex: 'specName',
15107
15112
  title: "SKU\u540D\u79F0",
@@ -22433,7 +22438,7 @@ var getColumns$9 = function getColumns(_ref) {
22433
22438
  updateHandle = _ref.updateHandle,
22434
22439
  updateDataHandle = _ref.updateDataHandle;
22435
22440
  return {
22436
- //巨益商品信息
22441
+ //吉客云商品信息
22437
22442
  JKY_GOODS: [{
22438
22443
  dataIndex: 'goodsNo',
22439
22444
  title: "\u8D27\u54C1\u7F16\u53F7",
@@ -22731,7 +22736,7 @@ var getColumns$9 = function getColumns(_ref) {
22731
22736
  ellipsis: true
22732
22737
  });
22733
22738
  }),
22734
- // 巨益补发商品信息
22739
+ // 吉客云补发商品信息
22735
22740
  JKY_REISSUE_GOODS: [{
22736
22741
  dataIndex: 'goodsNo',
22737
22742
  title: "\u8D27\u54C1\u7F16\u53F7",
@@ -22802,7 +22807,7 @@ var getColumns$9 = function getColumns(_ref) {
22802
22807
  }
22803
22808
  },
22804
22809
  render: function render(val, record, index) {
22805
- return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
22810
+ return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
22806
22811
  style: {
22807
22812
  width: 70
22808
22813
  },
@@ -22822,7 +22827,7 @@ var getColumns$9 = function getColumns(_ref) {
22822
22827
  title: "\u5355\u4EF7",
22823
22828
  width: 150,
22824
22829
  render: function render(val, record, index) {
22825
- return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
22830
+ return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
22826
22831
  style: {
22827
22832
  width: 130
22828
22833
  },
@@ -22842,25 +22847,28 @@ var getColumns$9 = function getColumns(_ref) {
22842
22847
  title: "\u603B\u91D1\u989D",
22843
22848
  width: 150,
22844
22849
  render: function render(val, record, index) {
22845
- return record.sellCount * record.sellPrice;
22850
+ if ((typeof record.sellCount === 'number' || record.sellCount) && (typeof record.sellPrice === 'number' || record.sellPrice)) {
22851
+ return record.sellCount * record.sellPrice;
22852
+ }
22853
+ return '';
22846
22854
  }
22847
22855
  }, {
22848
22856
  dataIndex: 'reason',
22849
22857
  title: "\u9000\u6362\u539F\u56E0",
22850
22858
  width: 250,
22851
22859
  render: function render(val, record, index) {
22852
- return /*#__PURE__*/React__default['default'].createElement(ApaasInput, {
22860
+ return !disabled ? /*#__PURE__*/React__default['default'].createElement(ApaasInput, {
22853
22861
  onChange: function onChange(value) {
22854
22862
  updateHandle(value, index, 'reason');
22855
22863
  }
22856
- });
22864
+ }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
22857
22865
  }
22858
22866
  }, {
22859
22867
  dataIndex: 'isGift',
22860
22868
  title: "\u662F\u5426\u8D60\u54C1",
22861
22869
  width: 150,
22862
22870
  render: function render(val, record, index) {
22863
- return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
22871
+ return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
22864
22872
  value: val,
22865
22873
  onChange: function onChange(value) {
22866
22874
  updateHandle(value, index, 'isGift');
@@ -22879,7 +22887,7 @@ var getColumns$9 = function getColumns(_ref) {
22879
22887
  title: "\u662F\u5426\u7EC4\u5408\u88C5",
22880
22888
  width: 150,
22881
22889
  render: function render(val, record, index) {
22882
- return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
22890
+ return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
22883
22891
  value: val,
22884
22892
  onChange: function onChange(value) {
22885
22893
  updateHandle(value, index, 'isFit');
@@ -23451,11 +23459,13 @@ var processKmGoods$1 = function processKmGoods(_ref7) {
23451
23459
  sysOuterId: item.goodNo,
23452
23460
  outerId: item.goodNo,
23453
23461
  skuSysId: item.specId,
23462
+ sysSkuId: item.specId,
23454
23463
  itemSysId: item.goodId,
23464
+ sysItemId: item.goodId,
23455
23465
  sysPicPath: item.goodPicUrl,
23456
23466
  payment: null,
23457
23467
  price: item.retailPrice,
23458
- type: null,
23468
+ type: (kmkfUtils.kmSkuTypeMap === null || kmkfUtils.kmSkuTypeMap === void 0 ? void 0 : kmkfUtils.kmSkuTypeMap[item === null || item === void 0 ? void 0 : item.skuType]) || '',
23459
23469
  uuid: kmkfUtils.uuid(),
23460
23470
  canDelete: true,
23461
23471
  canEdit: true
@@ -23570,7 +23580,7 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
23570
23580
  systemItemIds = dataSource === null || dataSource === void 0 ? void 0 : dataSource.filter(function (item) {
23571
23581
  return item === null || item === void 0 ? void 0 : item.sysItemId;
23572
23582
  }).map(function (item) {
23573
- return (item === null || item === void 0 ? void 0 : item.sysSkuId) == '-1' ? item === null || item === void 0 ? void 0 : item.sysItemId : "".concat(item === null || item === void 0 ? void 0 : item.sysItemId, "-").concat(item === null || item === void 0 ? void 0 : item.sysSkuId);
23583
+ return !(item === null || item === void 0 ? void 0 : item.sysSkuId) || (item === null || item === void 0 ? void 0 : item.sysSkuId) == '-1' || (item === null || item === void 0 ? void 0 : item.sysSkuId) == (item === null || item === void 0 ? void 0 : item.sysItemId) ? item === null || item === void 0 ? void 0 : item.sysItemId : "".concat(item === null || item === void 0 ? void 0 : item.sysItemId, "-").concat(item === null || item === void 0 ? void 0 : item.sysSkuId);
23574
23584
  });
23575
23585
  _context.next = 3;
23576
23586
  return kmkfUtils.servers.KM.getSupplierSingleton(systemItemIds);
@@ -23579,7 +23589,7 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
23579
23589
  dataSource === null || dataSource === void 0 ? void 0 : (_dataSource$filter = dataSource.filter(function (item) {
23580
23590
  return item === null || item === void 0 ? void 0 : item.sysItemId;
23581
23591
  })) === null || _dataSource$filter === void 0 ? void 0 : _dataSource$filter.forEach(function (item) {
23582
- var key = (item === null || item === void 0 ? void 0 : item.sysSkuId) == '-1' ? item === null || item === void 0 ? void 0 : item.sysItemId : "".concat(item === null || item === void 0 ? void 0 : item.sysItemId, "-").concat(item === null || item === void 0 ? void 0 : item.sysSkuId);
23592
+ var key = !(item === null || item === void 0 ? void 0 : item.sysSkuId) || (item === null || item === void 0 ? void 0 : item.sysSkuId) == '-1' || (item === null || item === void 0 ? void 0 : item.sysSkuId) == (item === null || item === void 0 ? void 0 : item.sysItemId) ? item === null || item === void 0 ? void 0 : item.sysItemId : "".concat(item === null || item === void 0 ? void 0 : item.sysItemId, "-").concat(item === null || item === void 0 ? void 0 : item.sysSkuId);
23583
23593
  var supplierInfo = supplierMap.get(key);
23584
23594
  item.supplierCode = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierCode;
23585
23595
  item.supplierName = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierName;
@@ -23818,7 +23828,7 @@ var GoodItem$1 = function GoodItem(props) {
23818
23828
  var isShowSelectTradeGoods = type !== 'JST_EXCHANGE_GOODS' || (jstReturnGoods === null || jstReturnGoods === void 0 ? void 0 : jstReturnGoods.jstSystemOrderNo);
23819
23829
  // 判断是否为是否展示系统单筛选项
23820
23830
  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;
23821
- 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;
23831
+ 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;
23822
23832
  var refModal = React.useRef();
23823
23833
  console.debug('表格数据', value);
23824
23834
  var handleDelete = function handleDelete(record, index) {
@@ -25123,7 +25133,7 @@ var getJkyOrderListSingleton = function getJkyOrderListSingleton(orderNo) {
25123
25133
  singletonMap$7.delete(orderNo);
25124
25134
  reject(err);
25125
25135
  };
25126
- extendRequest('/qy/gdfw/order/jkyOrderDetail', {
25136
+ extendRequest('/qy/gdfw/jky/erp/trade/fullInfo', {
25127
25137
  method: 'post',
25128
25138
  data: {
25129
25139
  billNo: orderNo
@@ -26841,7 +26851,7 @@ var CommonGoods = function CommonGoods(props) {
26841
26851
  value === null || value === void 0 ? void 0 : (_value$kmGoods = value.kmGoods) === null || _value$kmGoods === void 0 ? void 0 : (_value$kmGoods$filter = _value$kmGoods.filter(function (item) {
26842
26852
  return item === null || item === void 0 ? void 0 : item.sysItemId;
26843
26853
  })) === null || _value$kmGoods$filter === void 0 ? void 0 : _value$kmGoods$filter.forEach(function (item) {
26844
- var key = item.sysSkuId == '-1' ? item.sysItemId : "".concat(item.sysItemId, "-").concat(item.sysSkuId);
26854
+ var key = !(item === null || item === void 0 ? void 0 : item.sysSkuId) || (item === null || item === void 0 ? void 0 : item.sysSkuId) == '-1' || (item === null || item === void 0 ? void 0 : item.sysSkuId) == (item === null || item === void 0 ? void 0 : item.sysItemId) ? item === null || item === void 0 ? void 0 : item.sysItemId : "".concat(item === null || item === void 0 ? void 0 : item.sysItemId, "-").concat(item === null || item === void 0 ? void 0 : item.sysSkuId);
26845
26855
  map[key] = item;
26846
26856
  });
26847
26857
  }
@@ -26882,7 +26892,8 @@ var CommonGoods = function CommonGoods(props) {
26882
26892
  hasChange = false;
26883
26893
  currentValue = valueRef.current;
26884
26894
  kmGoods = currentValue === null || currentValue === void 0 ? void 0 : (_currentValue$kmGoods = currentValue.kmGoods) === null || _currentValue$kmGoods === void 0 ? void 0 : _currentValue$kmGoods.map(function (item) {
26885
- var supplierInfo = supplierMap.get(item.sysItemId);
26895
+ var key = !(item === null || item === void 0 ? void 0 : item.sysSkuId) || (item === null || item === void 0 ? void 0 : item.sysSkuId) == '-1' || (item === null || item === void 0 ? void 0 : item.sysSkuId) == (item === null || item === void 0 ? void 0 : item.sysItemId) ? item === null || item === void 0 ? void 0 : item.sysItemId : "".concat(item === null || item === void 0 ? void 0 : item.sysItemId, "-").concat(item === null || item === void 0 ? void 0 : item.sysSkuId);
26896
+ var supplierInfo = supplierMap.get(key);
26886
26897
  var newSupplierCode = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierCode;
26887
26898
  var newSupplierName = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierName;
26888
26899
  // 如果供应商信息有变化，标记需要更新
@@ -27853,10 +27864,26 @@ var typeMap$2 = {
27853
27864
  outerOiIdKey: '',
27854
27865
  goodDetailsKey: 'subOrderDetails',
27855
27866
  isShowSelectTradeGoods: true
27867
+ },
27868
+ JKY_REISSUE_GOODS: {
27869
+ compType: '补发',
27870
+ key: 'jkyReissueGoods',
27871
+ typeName: 'jkyReissueType',
27872
+ systemOrder: 'jkySystemOrder',
27873
+ systemOrderNo: 'jkySystemOrderNo',
27874
+ getOrderList: jkyUtils.getJkyOrderListSingleton,
27875
+ updateGoodsHandle: kmkfUtils.updateJkyGoodsHandle,
27876
+ alwaysShowChooseErpGoodsBtn: true,
27877
+ orderTypeKey: 'orderType',
27878
+ oIdKey: 'tradeNo',
27879
+ outerOiIdKey: '',
27880
+ goodDetailsKey: 'subOrderDetails',
27881
+ isShowSelectTradeGoods: true,
27882
+ showModeBtn: true
27856
27883
  }
27857
27884
  };
27858
27885
  var PublicReissue = function PublicReissue(props) {
27859
- 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;
27886
+ 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;
27860
27887
  var value = props.value,
27861
27888
  onChange = props.onChange,
27862
27889
  _props$reasonList = props.reasonList,
@@ -27979,7 +28006,7 @@ var PublicReissue = function PublicReissue(props) {
27979
28006
  value === null || value === void 0 ? void 0 : (_value$kmReissueGoods = value.kmReissueGoods) === null || _value$kmReissueGoods === void 0 ? void 0 : (_value$kmReissueGoods2 = _value$kmReissueGoods.filter(function (item) {
27980
28007
  return item === null || item === void 0 ? void 0 : item.sysItemId;
27981
28008
  })) === null || _value$kmReissueGoods2 === void 0 ? void 0 : _value$kmReissueGoods2.forEach(function (item) {
27982
- var key = item.sysSkuId == '-1' ? item.sysItemId : "".concat(item.sysItemId, "-").concat(item.sysSkuId);
28009
+ var key = !(item === null || item === void 0 ? void 0 : item.sysSkuId) || (item === null || item === void 0 ? void 0 : item.sysSkuId) == '-1' || (item === null || item === void 0 ? void 0 : item.sysSkuId) == (item === null || item === void 0 ? void 0 : item.sysItemId) ? item === null || item === void 0 ? void 0 : item.sysItemId : "".concat(item === null || item === void 0 ? void 0 : item.sysItemId, "-").concat(item === null || item === void 0 ? void 0 : item.sysSkuId);
27983
28010
  map[key] = item;
27984
28011
  });
27985
28012
  }
@@ -28020,7 +28047,8 @@ var PublicReissue = function PublicReissue(props) {
28020
28047
  hasChange = false;
28021
28048
  currentValue = valueRef.current;
28022
28049
  kmReissueGoods = currentValue === null || currentValue === void 0 ? void 0 : (_currentValue$kmReiss = currentValue.kmReissueGoods) === null || _currentValue$kmReiss === void 0 ? void 0 : _currentValue$kmReiss.map(function (item) {
28023
- var supplierInfo = supplierMap.get(item.sysItemId);
28050
+ var key = !(item === null || item === void 0 ? void 0 : item.sysSkuId) || (item === null || item === void 0 ? void 0 : item.sysSkuId) == '-1' || (item === null || item === void 0 ? void 0 : item.sysSkuId) == (item === null || item === void 0 ? void 0 : item.sysItemId) ? item === null || item === void 0 ? void 0 : item.sysItemId : "".concat(item === null || item === void 0 ? void 0 : item.sysItemId, "-").concat(item === null || item === void 0 ? void 0 : item.sysSkuId);
28051
+ var supplierInfo = supplierMap.get(key);
28024
28052
  var newSupplierCode = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierCode;
28025
28053
  var newSupplierName = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierName;
28026
28054
  // 如果供应商信息有变化，标记需要更新
@@ -28078,6 +28106,10 @@ var PublicReissue = function PublicReissue(props) {
28078
28106
  orderRest = {
28079
28107
  canEdit: true
28080
28108
  };
28109
+ } else if (['JKY_REISSUE_GOODS'].includes(type)) {
28110
+ orderRest = {
28111
+ canEdit: true
28112
+ };
28081
28113
  }
28082
28114
  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] : [];
28083
28115
  var hasGoodDetails = orders === null || orders === void 0 ? void 0 : orders.some(function (order) {
@@ -28219,17 +28251,17 @@ var PublicReissue = function PublicReissue(props) {
28219
28251
  return changeGoodHandle(val);
28220
28252
  },
28221
28253
  onModeChange: handleModeChange,
28222
- showModeBtn: false,
28254
+ 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),
28223
28255
  isStrict: isStrict,
28224
- 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,
28225
- 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,
28226
- 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)]] : [],
28256
+ 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,
28257
+ 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,
28258
+ 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)]] : [],
28227
28259
  tradeGoods: {
28228
28260
  originDataSource: getGoodDetails({
28229
28261
  mode: isStrict,
28230
- 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
28262
+ 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
28231
28263
  }),
28232
- 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',
28264
+ 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',
28233
28265
  selectedGoodsChange: selectedGoodsChange
28234
28266
  }
28235
28267
  })));
package/dist/src/bs/component/model/Columns/Erp/km.d.ts CHANGED
@@ -5,6 +5,12 @@ declare const _default: ({
5
5
  width: number;
6
6
  render: (val: string) => React.JSX.Element;
7
7
  ellipsis?: undefined;
8
+ } | {
9
+ dataIndex: string;
10
+ title: string;
11
+ ellipsis: boolean;
12
+ width: number;
13
+ render: (type: number) => React.JSX.Element;
8
14
  } | {
9
15
  dataIndex: string;
10
16
  title: string;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/basic-components",
3
- "version": "2.2.44-beta.2",
3
+ "version": "2.2.44-beta.22",
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.0",
23
+ "@kmkf-fe-packages/kmkf-utils": "2.2.44-beta.22",
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": "6fc7e660dcebeeaf353e65685b8b102d3e697c30"
69
+ "gitHead": "5f7da6546e40260630c0185ac564a89695a11a4a"
70
70
  }