@kmkf-fe-packages/basic-components 2.0.19-beta.1 → 2.0.19-beta.11

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 +79 -53
  2. package/dist/index.js +78 -52
  3. package/dist/src/bs/component/GoodItem/index.d.ts +1 -0
  4. package/package.json +3 -3
package/dist/index.esm.js CHANGED
@@ -3,7 +3,7 @@ import { Cascader, DatePicker, InputNumber, Input, Select, Upload, Image, messag
3
3
  import { EyeOutlined, DeleteOutlined, CloseCircleOutlined, CaretUpOutlined } from '@ant-design/icons';
4
4
  import request, { extend as extend$1 } from 'umi-request';
5
5
  import { CopyToClipboard } from 'react-copy-to-clipboard';
6
- import { AddressData, BsAddressData, WdtAddressData, GyAddressData, request as request$1, ExpressData, uuid, columnsGoodsList, LogisticsAddressData, SendDataCenter, BS_E3_BOOLEAN_STATUS_MAP, isNull, filterWdtOrders, WDT_ORDER_TYPE_MAP, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, filterJstOrders, filterKmOrders, 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, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, jstMergeIdenticalGoods, msgTypeCh } from '@kmkf-fe-packages/kmkf-utils';
6
+ import { AddressData, BsAddressData, WdtAddressData, GyAddressData, request as request$1, ExpressData, uuid, columnsGoodsList, LogisticsAddressData, SendDataCenter, BS_E3_BOOLEAN_STATUS_MAP, isNull, filterWdtOrders, WDT_ORDER_TYPE_MAP, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, filterJstOrders, filterKmOrders, 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, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog } from '@kmkf-fe-packages/kmkf-utils';
7
7
  import { debounce, isNaN as isNaN$1, isNumber as isNumber$1, cloneDeep, difference, differenceWith, takeRight, reject, isEmpty, intersection, uniqBy } from 'lodash';
8
8
  import { useUpdateEffect, useDebounceEffect, useAntdTable } from 'ahooks';
9
9
  import zhCN from 'antd/lib/locale/zh_CN';
@@ -10387,7 +10387,6 @@ var LogisticsInterception = function LogisticsInterception(props) {
10387
10387
  var changeHandle = function changeHandle(val, type) {
10388
10388
  var newValue = _objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, type, val));
10389
10389
  if (type === 'interceptCompany') {
10390
- var _matchKCodeList$;
10391
10390
  var interceptCompany = expressInterceptData.find(function (item) {
10392
10391
  return item.value === val;
10393
10392
  });
@@ -10432,8 +10431,8 @@ var LogisticsInterception = function LogisticsInterception(props) {
10432
10431
  status: '',
10433
10432
  reason: ''
10434
10433
  },
10435
- interceptLogisticsUserKCode: (matchKCodeList === null || matchKCodeList === void 0 ? void 0 : matchKCodeList.length) === 1 ? matchKCodeList[0].userKCode : undefined,
10436
- interceptLogisticsUserSecretKey: (matchKCodeList === null || matchKCodeList === void 0 ? void 0 : matchKCodeList.length) === 1 ? (_matchKCodeList$ = matchKCodeList[0]) === null || _matchKCodeList$ === void 0 ? void 0 : _matchKCodeList$.userSecretKey : undefined
10434
+ interceptLogisticsUserKCode: undefined,
10435
+ interceptLogisticsUserSecretKey: undefined
10437
10436
  });
10438
10437
  }
10439
10438
  if (type === 'interceptLogisticsApiStatus') {
@@ -10519,7 +10518,6 @@ var LogisticsInterception = function LogisticsInterception(props) {
10519
10518
  }));
10520
10519
  }
10521
10520
  }, 'k码配置>>') : null),
10522
- required: true,
10523
10521
  key: 'interceptLogisticsUserKCode',
10524
10522
  hidden: !showKcode
10525
10523
  }, /*#__PURE__*/React.createElement(Select, {
@@ -10543,7 +10541,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
10543
10541
  noStyle: true
10544
10542
  }, /*#__PURE__*/React.createElement(Input, {
10545
10543
  style: {
10546
- width: '200px',
10544
+ width: platform === 'pc' ? 200 : 150,
10547
10545
  marginTop: '6px'
10548
10546
  },
10549
10547
  placeholder: "\u5BA2\u6237\u5BC6\u94A5",
@@ -15416,6 +15414,8 @@ var GoodItem$1 = function GoodItem(props) {
15416
15414
  showErpGoodsBtn = _props$showErpGoodsBt === void 0 ? true : _props$showErpGoodsBt,
15417
15415
  _props$showModeBtn = props.showModeBtn,
15418
15416
  showModeBtn = _props$showModeBtn === void 0 ? false : _props$showModeBtn,
15417
+ _props$alwaysShowChoo = props.alwaysShowChooseErpGoodsBtn,
15418
+ alwaysShowChooseErpGoodsBtn = _props$alwaysShowChoo === void 0 ? false : _props$alwaysShowChoo,
15419
15419
  _props$isStrict = props.isStrict,
15420
15420
  isStrict = _props$isStrict === void 0 ? false : _props$isStrict,
15421
15421
  _props$tableSelect = props.tableSelect,
@@ -15499,7 +15499,9 @@ var GoodItem$1 = function GoodItem(props) {
15499
15499
  };
15500
15500
  var COLUMNS_MAP = function COLUMNS_MAP() {
15501
15501
  var text = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
15502
- var columnsOptions = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
15502
+ var columnsOptions = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
15503
+ operate: true
15504
+ };
15503
15505
  return function (type) {
15504
15506
  var columns = [];
15505
15507
  switch (type) {
@@ -15768,7 +15770,7 @@ var GoodItem$1 = function GoodItem(props) {
15768
15770
  return params;
15769
15771
  }, [tableSelect, selectedRowKeys]);
15770
15772
  var TheGoodsModal = GoodsModalMap[type || 'OTHER_GOODS'] || GoodsModalMap['OTHER_GOODS'];
15771
- return /*#__PURE__*/React.createElement(React.Fragment, null, !disabled && showChangeBtn && /*#__PURE__*/React.createElement("div", {
15773
+ return /*#__PURE__*/React.createElement(React.Fragment, null, !disabled && (showChangeBtn ? /*#__PURE__*/React.createElement("div", {
15772
15774
  style: {
15773
15775
  float: 'right'
15774
15776
  }
@@ -15785,7 +15787,14 @@ var GoodItem$1 = function GoodItem(props) {
15785
15787
  }), showErpGoodsBtn && /*#__PURE__*/React.createElement(Button, {
15786
15788
  type: "link",
15787
15789
  onClick: handleChangeGoods
15788
- }, getButtonText(type)), otherOperations), /*#__PURE__*/React.createElement(Table, _objectSpread2(_objectSpread2({}, tableConfig), {}, {
15790
+ }, getButtonText(type)), otherOperations) : showErpGoodsBtn && alwaysShowChooseErpGoodsBtn && /*#__PURE__*/React.createElement("div", {
15791
+ style: {
15792
+ float: 'right'
15793
+ }
15794
+ }, /*#__PURE__*/React.createElement(Button, {
15795
+ type: "link",
15796
+ onClick: handleChangeGoods
15797
+ }, getButtonText(type)))), /*#__PURE__*/React.createElement(Table, _objectSpread2(_objectSpread2({}, tableConfig), {}, {
15789
15798
  columns: newColumns,
15790
15799
  dataSource: value,
15791
15800
  rowKey: uniqueKey,
@@ -17884,6 +17893,7 @@ var typeMap$2 = {
17884
17893
  systemOrderBillType: 'jstSystemOrderBillType',
17885
17894
  getOrderList: jstUtils.getJstOrderListSingleton,
17886
17895
  updateGoodsHandle: updateJstGoodsHandle,
17896
+ alwaysShowChooseErpGoodsBtn: true,
17887
17897
  orderTypeKey: 'orderType',
17888
17898
  oIdKey: 'oId',
17889
17899
  outerOiIdKey: '',
@@ -17898,11 +17908,11 @@ var typeMap$2 = {
17898
17908
  systemOrderBillType: 'jstSystemOrderBillType',
17899
17909
  getOrderList: jstUtils.getJstOrderListSingleton,
17900
17910
  updateGoodsHandle: updateJstGoodsHandle,
17911
+ alwaysShowChooseErpGoodsBtn: true,
17901
17912
  orderTypeKey: 'orderType',
17902
17913
  oIdKey: 'oId',
17903
17914
  outerOiIdKey: '',
17904
17915
  goodDetailsKey: 'items',
17905
- showErpGoodsBtn: false,
17906
17916
  eventNameMap: {
17907
17917
  // pubsub 事件
17908
17918
  exchangeCopyGood: 'jstExchangeCopyGood',
@@ -17913,7 +17923,7 @@ var typeMap$2 = {
17913
17923
  }
17914
17924
  };
17915
17925
  var PublicReissue = function PublicReissue(props) {
17916
- var _typeMap$type31, _typeMap$type34, _typeMap$type35, _typeMap$type36, _typeMap$type37, _value$typeMap$type$s6, _typeMap$type38, _typeMap$type39, _typeMap$type40, _typeMap$type41, _typeMap$type42, _typeMap$type43;
17926
+ var _typeMap$type31, _typeMap$type34, _typeMap$type35, _typeMap$type36, _typeMap$type37, _value$typeMap$type$s6, _typeMap$type38, _typeMap$type39, _typeMap$type40, _typeMap$type41, _typeMap$type42, _typeMap$type43, _typeMap$type44;
17917
17927
  var value = props.value,
17918
17928
  onChange = props.onChange,
17919
17929
  _props$reasonList = props.reasonList,
@@ -18154,9 +18164,10 @@ var PublicReissue = function PublicReissue(props) {
18154
18164
  disabled: disabled,
18155
18165
  canUpdateNumber: showChangeBtn,
18156
18166
  showChangeBtn: showChangeBtn,
18157
- showErpGoodsBtn: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type42 = typeMap$2[type]) === null || _typeMap$type42 === void 0 ? void 0 : _typeMap$type42.showErpGoodsBtn,
18167
+ alwaysShowChooseErpGoodsBtn: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type42 = typeMap$2[type]) === null || _typeMap$type42 === void 0 ? void 0 : _typeMap$type42.alwaysShowChooseErpGoodsBtn,
18168
+ showErpGoodsBtn: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type43 = typeMap$2[type]) === null || _typeMap$type43 === void 0 ? void 0 : _typeMap$type43.showErpGoodsBtn,
18158
18169
  shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
18159
- value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type43 = typeMap$2[type]) === null || _typeMap$type43 === void 0 ? void 0 : _typeMap$type43.key)],
18170
+ value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type44 = typeMap$2[type]) === null || _typeMap$type44 === void 0 ? void 0 : _typeMap$type44.key)],
18160
18171
  onChange: function onChange(val) {
18161
18172
  return changeGoodHandle(val);
18162
18173
  },
@@ -19201,7 +19212,7 @@ var typeMap$4 = {
19201
19212
  }
19202
19213
  };
19203
19214
  var GyReissue = function GyReissue(props) {
19204
- var _value$gySystemOrder, _typeMap$type26, _typeMap$type28, _typeMap$type29, _value$typeMap$type$s5, _typeMap$type30, _typeMap$type31, _typeMap$type32;
19215
+ var _value$gySystemOrder, _typeMap$type28, _typeMap$type30, _typeMap$type31, _value$typeMap$type$s5, _typeMap$type32, _typeMap$type33, _typeMap$type34;
19205
19216
  var value = props.value,
19206
19217
  onChange = props.onChange,
19207
19218
  _props$reasonList = props.reasonList,
@@ -19234,7 +19245,7 @@ var GyReissue = function GyReissue(props) {
19234
19245
  while (1) switch (_context.prev = _context.next) {
19235
19246
  case 0:
19236
19247
  (_typeMap$type4 = typeMap$4[type]) === null || _typeMap$type4 === void 0 ? void 0 : _typeMap$type4.getOrderList(orderNo).then(function (data) {
19237
- var _typeMap$type5, _typeMap$type6;
19248
+ var _typeMap$type5, _typeMap$type6, _typeMap$type7, _typeMap$type8;
19238
19249
  var orders = (data === null || data === void 0 ? void 0 : data.trades) || [];
19239
19250
  var showOrderInfo = orders.map(function (_ref2) {
19240
19251
  var billNo = _ref2.billNo,
@@ -19256,7 +19267,14 @@ var GyReissue = function GyReissue(props) {
19256
19267
  shopCode: shopCode
19257
19268
  });
19258
19269
  });
19259
- onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, (_typeMap$type5 = typeMap$4[type]) === null || _typeMap$type5 === void 0 ? void 0 : _typeMap$type5.systemOrder, _objectSpread2(_objectSpread2({}, value[(_typeMap$type6 = typeMap$4[type]) === null || _typeMap$type6 === void 0 ? void 0 : _typeMap$type6.systemOrder]), {}, {
19270
+ pushGyLog('getOrderList', {
19271
+ before: value,
19272
+ after: _objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, (_typeMap$type5 = typeMap$4[type]) === null || _typeMap$type5 === void 0 ? void 0 : _typeMap$type5.systemOrder, _objectSpread2(_objectSpread2({}, value[(_typeMap$type6 = typeMap$4[type]) === null || _typeMap$type6 === void 0 ? void 0 : _typeMap$type6.systemOrder]), {}, {
19273
+ showOrderInfo: showOrderInfo,
19274
+ orders: orders
19275
+ })))
19276
+ });
19277
+ onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, (_typeMap$type7 = typeMap$4[type]) === null || _typeMap$type7 === void 0 ? void 0 : _typeMap$type7.systemOrder, _objectSpread2(_objectSpread2({}, value[(_typeMap$type8 = typeMap$4[type]) === null || _typeMap$type8 === void 0 ? void 0 : _typeMap$type8.systemOrder]), {}, {
19260
19278
  showOrderInfo: showOrderInfo,
19261
19279
  orders: orders
19262
19280
  }))));
@@ -19272,39 +19290,41 @@ var GyReissue = function GyReissue(props) {
19272
19290
  };
19273
19291
  }();
19274
19292
  var changeTypeHandle = function changeTypeHandle(val) {
19275
- var _value$typeMap$type$t, _typeMap$type7, _typeMap$type8;
19293
+ var _value$typeMap$type$t, _typeMap$type9, _typeMap$type10;
19294
+ pushGyLog('beforeChangeType', value);
19276
19295
  var typeName = val === null || val === void 0 ? void 0 : val[0];
19277
- if (typeName === (value === null || value === void 0 ? void 0 : (_value$typeMap$type$t = value[(_typeMap$type7 = typeMap$4[type]) === null || _typeMap$type7 === void 0 ? void 0 : _typeMap$type7.typeName]) === null || _value$typeMap$type$t === void 0 ? void 0 : _value$typeMap$type$t[0])) return;
19296
+ if (typeName === (value === null || value === void 0 ? void 0 : (_value$typeMap$type$t = value[(_typeMap$type9 = typeMap$4[type]) === null || _typeMap$type9 === void 0 ? void 0 : _typeMap$type9.typeName]) === null || _value$typeMap$type$t === void 0 ? void 0 : _value$typeMap$type$t[0])) return;
19278
19297
  // const systemOrderNo = value?.[typeMap[type]?.systemOrderNo];
19279
19298
  var newValue = _objectSpread2({}, value);
19280
- newValue[(_typeMap$type8 = typeMap$4[type]) === null || _typeMap$type8 === void 0 ? void 0 : _typeMap$type8.typeName] = val;
19299
+ newValue[(_typeMap$type10 = typeMap$4[type]) === null || _typeMap$type10 === void 0 ? void 0 : _typeMap$type10.typeName] = val;
19281
19300
  if (typeName === '1') {
19282
- var _typeMap$type9;
19283
- newValue[(_typeMap$type9 = typeMap$4[type]) === null || _typeMap$type9 === void 0 ? void 0 : _typeMap$type9.key] = getGoodDetails({
19301
+ var _typeMap$type11;
19302
+ newValue[(_typeMap$type11 = typeMap$4[type]) === null || _typeMap$type11 === void 0 ? void 0 : _typeMap$type11.key] = getGoodDetails({
19284
19303
  mode: isStrict
19285
19304
  });
19286
19305
  } else if (typeName === '2') {
19287
- var _typeMap$type10;
19306
+ var _typeMap$type12;
19288
19307
  // 切换到非原单，清空列表
19289
- newValue[(_typeMap$type10 = typeMap$4[type]) === null || _typeMap$type10 === void 0 ? void 0 : _typeMap$type10.key] = [];
19308
+ newValue[(_typeMap$type12 = typeMap$4[type]) === null || _typeMap$type12 === void 0 ? void 0 : _typeMap$type12.key] = [];
19290
19309
  }
19310
+ pushGyLog('afterChangeType', newValue);
19291
19311
  onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
19292
19312
  };
19293
19313
  var handleModeChange = function handleModeChange(mode) {
19294
- var _value$typeMap$type$t2, _typeMap$type11, _typeMap$type12;
19295
- var isOriginalOrder = (value === null || value === void 0 ? void 0 : (_value$typeMap$type$t2 = value[(_typeMap$type11 = typeMap$4[type]) === null || _typeMap$type11 === void 0 ? void 0 : _typeMap$type11.typeName]) === null || _value$typeMap$type$t2 === void 0 ? void 0 : _value$typeMap$type$t2[0]) === '1';
19314
+ var _value$typeMap$type$t2, _typeMap$type13, _typeMap$type14;
19315
+ var isOriginalOrder = (value === null || value === void 0 ? void 0 : (_value$typeMap$type$t2 = value[(_typeMap$type13 = typeMap$4[type]) === null || _typeMap$type13 === void 0 ? void 0 : _typeMap$type13.typeName]) === null || _value$typeMap$type$t2 === void 0 ? void 0 : _value$typeMap$type$t2[0]) === '1';
19296
19316
  setIsStrict(mode);
19297
19317
  if (!isOriginalOrder) return;
19298
- onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, (_typeMap$type12 = typeMap$4[type]) === null || _typeMap$type12 === void 0 ? void 0 : _typeMap$type12.key, getGoodDetails({
19318
+ onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, (_typeMap$type14 = typeMap$4[type]) === null || _typeMap$type14 === void 0 ? void 0 : _typeMap$type14.key, getGoodDetails({
19299
19319
  mode: mode
19300
19320
  }))));
19301
19321
  };
19302
19322
  var getGoodDetails = function getGoodDetails(_ref3) {
19303
- var _typeMap$type13, _typeMap$type14, _order$details;
19323
+ var _typeMap$type15, _typeMap$type16, _order$details;
19304
19324
  var mode = _ref3.mode,
19305
19325
  sysOrderNo = _ref3.sysOrderNo;
19306
- var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type13 = typeMap$4[type]) === null || _typeMap$type13 === void 0 ? void 0 : _typeMap$type13.systemOrder];
19307
- var systemOrderNo = sysOrderNo !== null && sysOrderNo !== void 0 ? sysOrderNo : value === null || value === void 0 ? void 0 : value[(_typeMap$type14 = typeMap$4[type]) === null || _typeMap$type14 === void 0 ? void 0 : _typeMap$type14.systemOrderNo];
19326
+ var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type15 = typeMap$4[type]) === null || _typeMap$type15 === void 0 ? void 0 : _typeMap$type15.systemOrder];
19327
+ var systemOrderNo = sysOrderNo !== null && sysOrderNo !== void 0 ? sysOrderNo : value === null || value === void 0 ? void 0 : value[(_typeMap$type16 = typeMap$4[type]) === null || _typeMap$type16 === void 0 ? void 0 : _typeMap$type16.systemOrderNo];
19308
19328
  var order = systemOrderNo && ((systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || []).find(function (order) {
19309
19329
  return order.code === systemOrderNo;
19310
19330
  });
@@ -19315,52 +19335,58 @@ var GyReissue = function GyReissue(props) {
19315
19335
  }) : goodDetails;
19316
19336
  };
19317
19337
  var changeGoodHandle = function changeGoodHandle(val) {
19318
- var _typeMap$type15;
19338
+ var _typeMap$type17;
19339
+ pushGyLog('beforeChangeGood', value);
19319
19340
  var newValue = _objectSpread2({}, value);
19320
- newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type15 = typeMap$4[type]) === null || _typeMap$type15 === void 0 ? void 0 : _typeMap$type15.key)] = (val || []).map(function (item) {
19321
- var _typeMap$type16, _typeMap$type17;
19322
- item["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type16 = typeMap$4[type]) === null || _typeMap$type16 === void 0 ? void 0 : _typeMap$type16.formatDefaultField.money)] = 0;
19323
- item["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type17 = typeMap$4[type]) === null || _typeMap$type17 === void 0 ? void 0 : _typeMap$type17.formatDefaultField.share)] = 0;
19341
+ newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type17 = typeMap$4[type]) === null || _typeMap$type17 === void 0 ? void 0 : _typeMap$type17.key)] = (val || []).map(function (item) {
19342
+ var _typeMap$type18, _typeMap$type19;
19343
+ item["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type18 = typeMap$4[type]) === null || _typeMap$type18 === void 0 ? void 0 : _typeMap$type18.formatDefaultField.money)] = 0;
19344
+ item["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type19 = typeMap$4[type]) === null || _typeMap$type19 === void 0 ? void 0 : _typeMap$type19.formatDefaultField.share)] = 0;
19324
19345
  return item;
19325
19346
  });
19347
+ pushGyLog('afterChangeGood', newValue);
19326
19348
  onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
19327
19349
  };
19328
19350
  var changeSystemOrderHandle = function changeSystemOrderHandle(val) {
19329
- var _typeMap$type18, _value$typeMap$type$t3, _typeMap$type19, _value$typeMap$type$t4, _typeMap$type21;
19351
+ var _typeMap$type20, _value$typeMap$type$t3, _typeMap$type21, _value$typeMap$type$t4, _typeMap$type23;
19352
+ pushGyLog('beforeChangeSystemOrder', value);
19330
19353
  var newValue = _objectSpread2({}, value);
19331
- newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type18 = typeMap$4[type]) === null || _typeMap$type18 === void 0 ? void 0 : _typeMap$type18.systemOrderNo)] = val;
19332
- if (['2'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t3 = value[(_typeMap$type19 = typeMap$4[type]) === null || _typeMap$type19 === void 0 ? void 0 : _typeMap$type19.typeName]) === null || _value$typeMap$type$t3 === void 0 ? void 0 : _value$typeMap$type$t3[0])) {
19333
- var _typeMap$type20;
19334
- newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type20 = typeMap$4[type]) === null || _typeMap$type20 === void 0 ? void 0 : _typeMap$type20.key)] = [];
19335
- } else if (['1'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t4 = value[(_typeMap$type21 = typeMap$4[type]) === null || _typeMap$type21 === void 0 ? void 0 : _typeMap$type21.typeName]) === null || _value$typeMap$type$t4 === void 0 ? void 0 : _value$typeMap$type$t4[0])) {
19354
+ newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type20 = typeMap$4[type]) === null || _typeMap$type20 === void 0 ? void 0 : _typeMap$type20.systemOrderNo)] = val;
19355
+ if (['2'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t3 = value[(_typeMap$type21 = typeMap$4[type]) === null || _typeMap$type21 === void 0 ? void 0 : _typeMap$type21.typeName]) === null || _value$typeMap$type$t3 === void 0 ? void 0 : _value$typeMap$type$t3[0])) {
19336
19356
  var _typeMap$type22;
19337
- newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type22 = typeMap$4[type]) === null || _typeMap$type22 === void 0 ? void 0 : _typeMap$type22.key)] = getGoodDetails({
19357
+ newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type22 = typeMap$4[type]) === null || _typeMap$type22 === void 0 ? void 0 : _typeMap$type22.key)] = [];
19358
+ } else if (['1'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t4 = value[(_typeMap$type23 = typeMap$4[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.typeName]) === null || _value$typeMap$type$t4 === void 0 ? void 0 : _value$typeMap$type$t4[0])) {
19359
+ var _typeMap$type24;
19360
+ newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type24 = typeMap$4[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.key)] = getGoodDetails({
19338
19361
  mode: isStrict,
19339
19362
  sysOrderNo: val
19340
19363
  });
19341
19364
  }
19365
+ pushGyLog('afterChangeSystemOrder', newValue);
19342
19366
  onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
19343
19367
  };
19344
19368
  var selectedGoodsChange = useCallback(function (skuList) {
19345
- var _typeMap$type23, _typeMap$type24, _uniqBy, _typeMap$type25;
19369
+ var _typeMap$type25, _typeMap$type26, _uniqBy, _typeMap$type27;
19370
+ pushGyLog('beforeSelectedGoodsChange', value);
19346
19371
  var newValue = _objectSpread2({}, value);
19347
19372
  // 原订单商品
19348
19373
  var originTradeGoodList = getGoodDetails({
19349
19374
  mode: isStrict
19350
19375
  }) || [];
19351
19376
  // 当前选中的所有商品【包含了原订单+商品库】
19352
- var currentSelectGoodList = (value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type23 = typeMap$4[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.key)]) || [];
19353
- newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type24 = typeMap$4[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.key)] = (_uniqBy = uniqBy(originTradeGoodList.concat(currentSelectGoodList), 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
19377
+ var currentSelectGoodList = (value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type25 = typeMap$4[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.key)]) || [];
19378
+ newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type26 = typeMap$4[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.key)] = (_uniqBy = uniqBy(originTradeGoodList.concat(currentSelectGoodList), 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
19354
19379
  return skuList.includes(item.uuid);
19355
19380
  });
19356
- console.log('商品发生变化', newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type25 = typeMap$4[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.key)]);
19381
+ console.log('商品发生变化', newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type27 = typeMap$4[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.key)]);
19357
19382
  onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
19358
- }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type26 = typeMap$4[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.key)], isStrict]);
19383
+ pushGyLog('afterSelectedGoodsChange', newValue);
19384
+ }, [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]);
19359
19385
  //系统单选择后展示选择商品按钮，系统单未选择的时候不展示
19360
19386
  var showChangeBtn = useMemo(function () {
19361
- var _typeMap$type27;
19362
- return !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type27 = typeMap$4[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.systemOrderNo]);
19363
- }, [value === null || value === void 0 ? void 0 : value[(_typeMap$type28 = typeMap$4[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.systemOrderNo]]);
19387
+ var _typeMap$type29;
19388
+ return !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type29 = typeMap$4[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.systemOrderNo]);
19389
+ }, [value === null || value === void 0 ? void 0 : value[(_typeMap$type30 = typeMap$4[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.systemOrderNo]]);
19364
19390
  return /*#__PURE__*/React.createElement("div", {
19365
19391
  id: "TEST_GY",
19366
19392
  onClick: function onClick() {
@@ -19383,12 +19409,12 @@ var GyReissue = function GyReissue(props) {
19383
19409
  },
19384
19410
  disabled: disabled,
19385
19411
  allowClear: false,
19386
- value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type29 = typeMap$4[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.systemOrderNo)],
19412
+ value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type31 = typeMap$4[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.systemOrderNo)],
19387
19413
  onChange: function onChange(val) {
19388
19414
  return changeSystemOrderHandle(val);
19389
19415
  },
19390
19416
  placeholder: "\u9009\u62E9\u8865\u53D1\u7CFB\u7EDF\u5355"
19391
- }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s5 = value[(_typeMap$type30 = typeMap$4[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.systemOrder]) === null || _value$typeMap$type$s5 === void 0 ? void 0 : _value$typeMap$type$s5.showOrderInfo) || []).map(function (item) {
19417
+ }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s5 = value[(_typeMap$type32 = typeMap$4[type]) === null || _typeMap$type32 === void 0 ? void 0 : _typeMap$type32.systemOrder]) === null || _value$typeMap$type$s5 === void 0 ? void 0 : _value$typeMap$type$s5.showOrderInfo) || []).map(function (item) {
19392
19418
  return /*#__PURE__*/React.createElement(Select.Option, {
19393
19419
  key: item.billNo,
19394
19420
  value: item.billNo,
@@ -19409,7 +19435,7 @@ var GyReissue = function GyReissue(props) {
19409
19435
  disabled: disabled,
19410
19436
  allowClear: false,
19411
19437
  options: reasonList,
19412
- value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type31 = typeMap$4[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.typeName)],
19438
+ value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type33 = typeMap$4[type]) === null || _typeMap$type33 === void 0 ? void 0 : _typeMap$type33.typeName)],
19413
19439
  onChange: function onChange(val) {
19414
19440
  return changeTypeHandle(val);
19415
19441
  }
@@ -19421,7 +19447,7 @@ var GyReissue = function GyReissue(props) {
19421
19447
  canUpdateNumber: showChangeBtn,
19422
19448
  showChangeBtn: showChangeBtn,
19423
19449
  shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
19424
- value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type32 = typeMap$4[type]) === null || _typeMap$type32 === void 0 ? void 0 : _typeMap$type32.key)],
19450
+ 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)],
19425
19451
  onChange: function onChange(val) {
19426
19452
  return changeGoodHandle(val);
19427
19453
  },
package/dist/index.js CHANGED
@@ -10399,7 +10399,6 @@ var LogisticsInterception = function LogisticsInterception(props) {
10399
10399
  var changeHandle = function changeHandle(val, type) {
10400
10400
  var newValue = _objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, type, val));
10401
10401
  if (type === 'interceptCompany') {
10402
- var _matchKCodeList$;
10403
10402
  var interceptCompany = expressInterceptData.find(function (item) {
10404
10403
  return item.value === val;
10405
10404
  });
@@ -10444,8 +10443,8 @@ var LogisticsInterception = function LogisticsInterception(props) {
10444
10443
  status: '',
10445
10444
  reason: ''
10446
10445
  },
10447
- interceptLogisticsUserKCode: (matchKCodeList === null || matchKCodeList === void 0 ? void 0 : matchKCodeList.length) === 1 ? matchKCodeList[0].userKCode : undefined,
10448
- interceptLogisticsUserSecretKey: (matchKCodeList === null || matchKCodeList === void 0 ? void 0 : matchKCodeList.length) === 1 ? (_matchKCodeList$ = matchKCodeList[0]) === null || _matchKCodeList$ === void 0 ? void 0 : _matchKCodeList$.userSecretKey : undefined
10446
+ interceptLogisticsUserKCode: undefined,
10447
+ interceptLogisticsUserSecretKey: undefined
10449
10448
  });
10450
10449
  }
10451
10450
  if (type === 'interceptLogisticsApiStatus') {
@@ -10531,7 +10530,6 @@ var LogisticsInterception = function LogisticsInterception(props) {
10531
10530
  }));
10532
10531
  }
10533
10532
  }, 'k码配置>>') : null),
10534
- required: true,
10535
10533
  key: 'interceptLogisticsUserKCode',
10536
10534
  hidden: !showKcode
10537
10535
  }, /*#__PURE__*/React__default['default'].createElement(antd.Select, {
@@ -10555,7 +10553,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
10555
10553
  noStyle: true
10556
10554
  }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
10557
10555
  style: {
10558
- width: '200px',
10556
+ width: platform === 'pc' ? 200 : 150,
10559
10557
  marginTop: '6px'
10560
10558
  },
10561
10559
  placeholder: "\u5BA2\u6237\u5BC6\u94A5",
@@ -15428,6 +15426,8 @@ var GoodItem$1 = function GoodItem(props) {
15428
15426
  showErpGoodsBtn = _props$showErpGoodsBt === void 0 ? true : _props$showErpGoodsBt,
15429
15427
  _props$showModeBtn = props.showModeBtn,
15430
15428
  showModeBtn = _props$showModeBtn === void 0 ? false : _props$showModeBtn,
15429
+ _props$alwaysShowChoo = props.alwaysShowChooseErpGoodsBtn,
15430
+ alwaysShowChooseErpGoodsBtn = _props$alwaysShowChoo === void 0 ? false : _props$alwaysShowChoo,
15431
15431
  _props$isStrict = props.isStrict,
15432
15432
  isStrict = _props$isStrict === void 0 ? false : _props$isStrict,
15433
15433
  _props$tableSelect = props.tableSelect,
@@ -15511,7 +15511,9 @@ var GoodItem$1 = function GoodItem(props) {
15511
15511
  };
15512
15512
  var COLUMNS_MAP = function COLUMNS_MAP() {
15513
15513
  var text = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
15514
- var columnsOptions = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
15514
+ var columnsOptions = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
15515
+ operate: true
15516
+ };
15515
15517
  return function (type) {
15516
15518
  var columns = [];
15517
15519
  switch (type) {
@@ -15780,7 +15782,7 @@ var GoodItem$1 = function GoodItem(props) {
15780
15782
  return params;
15781
15783
  }, [tableSelect, selectedRowKeys]);
15782
15784
  var TheGoodsModal = GoodsModalMap[type || 'OTHER_GOODS'] || GoodsModalMap['OTHER_GOODS'];
15783
- return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, !disabled && showChangeBtn && /*#__PURE__*/React__default['default'].createElement("div", {
15785
+ return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, !disabled && (showChangeBtn ? /*#__PURE__*/React__default['default'].createElement("div", {
15784
15786
  style: {
15785
15787
  float: 'right'
15786
15788
  }
@@ -15797,7 +15799,14 @@ var GoodItem$1 = function GoodItem(props) {
15797
15799
  }), showErpGoodsBtn && /*#__PURE__*/React__default['default'].createElement(antd.Button, {
15798
15800
  type: "link",
15799
15801
  onClick: handleChangeGoods
15800
- }, getButtonText(type)), otherOperations), /*#__PURE__*/React__default['default'].createElement(antd.Table, _objectSpread2(_objectSpread2({}, tableConfig), {}, {
15802
+ }, getButtonText(type)), otherOperations) : showErpGoodsBtn && alwaysShowChooseErpGoodsBtn && /*#__PURE__*/React__default['default'].createElement("div", {
15803
+ style: {
15804
+ float: 'right'
15805
+ }
15806
+ }, /*#__PURE__*/React__default['default'].createElement(antd.Button, {
15807
+ type: "link",
15808
+ onClick: handleChangeGoods
15809
+ }, getButtonText(type)))), /*#__PURE__*/React__default['default'].createElement(antd.Table, _objectSpread2(_objectSpread2({}, tableConfig), {}, {
15801
15810
  columns: newColumns,
15802
15811
  dataSource: value,
15803
15812
  rowKey: uniqueKey,
@@ -17896,6 +17905,7 @@ var typeMap$2 = {
17896
17905
  systemOrderBillType: 'jstSystemOrderBillType',
17897
17906
  getOrderList: jstUtils.getJstOrderListSingleton,
17898
17907
  updateGoodsHandle: kmkfUtils.updateJstGoodsHandle,
17908
+ alwaysShowChooseErpGoodsBtn: true,
17899
17909
  orderTypeKey: 'orderType',
17900
17910
  oIdKey: 'oId',
17901
17911
  outerOiIdKey: '',
@@ -17910,11 +17920,11 @@ var typeMap$2 = {
17910
17920
  systemOrderBillType: 'jstSystemOrderBillType',
17911
17921
  getOrderList: jstUtils.getJstOrderListSingleton,
17912
17922
  updateGoodsHandle: kmkfUtils.updateJstGoodsHandle,
17923
+ alwaysShowChooseErpGoodsBtn: true,
17913
17924
  orderTypeKey: 'orderType',
17914
17925
  oIdKey: 'oId',
17915
17926
  outerOiIdKey: '',
17916
17927
  goodDetailsKey: 'items',
17917
- showErpGoodsBtn: false,
17918
17928
  eventNameMap: {
17919
17929
  // pubsub 事件
17920
17930
  exchangeCopyGood: 'jstExchangeCopyGood',
@@ -17925,7 +17935,7 @@ var typeMap$2 = {
17925
17935
  }
17926
17936
  };
17927
17937
  var PublicReissue = function PublicReissue(props) {
17928
- var _typeMap$type31, _typeMap$type34, _typeMap$type35, _typeMap$type36, _typeMap$type37, _value$typeMap$type$s6, _typeMap$type38, _typeMap$type39, _typeMap$type40, _typeMap$type41, _typeMap$type42, _typeMap$type43;
17938
+ var _typeMap$type31, _typeMap$type34, _typeMap$type35, _typeMap$type36, _typeMap$type37, _value$typeMap$type$s6, _typeMap$type38, _typeMap$type39, _typeMap$type40, _typeMap$type41, _typeMap$type42, _typeMap$type43, _typeMap$type44;
17929
17939
  var value = props.value,
17930
17940
  onChange = props.onChange,
17931
17941
  _props$reasonList = props.reasonList,
@@ -18166,9 +18176,10 @@ var PublicReissue = function PublicReissue(props) {
18166
18176
  disabled: disabled,
18167
18177
  canUpdateNumber: showChangeBtn,
18168
18178
  showChangeBtn: showChangeBtn,
18169
- showErpGoodsBtn: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type42 = typeMap$2[type]) === null || _typeMap$type42 === void 0 ? void 0 : _typeMap$type42.showErpGoodsBtn,
18179
+ alwaysShowChooseErpGoodsBtn: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type42 = typeMap$2[type]) === null || _typeMap$type42 === void 0 ? void 0 : _typeMap$type42.alwaysShowChooseErpGoodsBtn,
18180
+ showErpGoodsBtn: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type43 = typeMap$2[type]) === null || _typeMap$type43 === void 0 ? void 0 : _typeMap$type43.showErpGoodsBtn,
18170
18181
  shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
18171
- value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type43 = typeMap$2[type]) === null || _typeMap$type43 === void 0 ? void 0 : _typeMap$type43.key)],
18182
+ value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type44 = typeMap$2[type]) === null || _typeMap$type44 === void 0 ? void 0 : _typeMap$type44.key)],
18172
18183
  onChange: function onChange(val) {
18173
18184
  return changeGoodHandle(val);
18174
18185
  },
@@ -19213,7 +19224,7 @@ var typeMap$4 = {
19213
19224
  }
19214
19225
  };
19215
19226
  var GyReissue = function GyReissue(props) {
19216
- var _value$gySystemOrder, _typeMap$type26, _typeMap$type28, _typeMap$type29, _value$typeMap$type$s5, _typeMap$type30, _typeMap$type31, _typeMap$type32;
19227
+ var _value$gySystemOrder, _typeMap$type28, _typeMap$type30, _typeMap$type31, _value$typeMap$type$s5, _typeMap$type32, _typeMap$type33, _typeMap$type34;
19217
19228
  var value = props.value,
19218
19229
  onChange = props.onChange,
19219
19230
  _props$reasonList = props.reasonList,
@@ -19246,7 +19257,7 @@ var GyReissue = function GyReissue(props) {
19246
19257
  while (1) switch (_context.prev = _context.next) {
19247
19258
  case 0:
19248
19259
  (_typeMap$type4 = typeMap$4[type]) === null || _typeMap$type4 === void 0 ? void 0 : _typeMap$type4.getOrderList(orderNo).then(function (data) {
19249
- var _typeMap$type5, _typeMap$type6;
19260
+ var _typeMap$type5, _typeMap$type6, _typeMap$type7, _typeMap$type8;
19250
19261
  var orders = (data === null || data === void 0 ? void 0 : data.trades) || [];
19251
19262
  var showOrderInfo = orders.map(function (_ref2) {
19252
19263
  var billNo = _ref2.billNo,
@@ -19268,7 +19279,14 @@ var GyReissue = function GyReissue(props) {
19268
19279
  shopCode: shopCode
19269
19280
  });
19270
19281
  });
19271
- onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, (_typeMap$type5 = typeMap$4[type]) === null || _typeMap$type5 === void 0 ? void 0 : _typeMap$type5.systemOrder, _objectSpread2(_objectSpread2({}, value[(_typeMap$type6 = typeMap$4[type]) === null || _typeMap$type6 === void 0 ? void 0 : _typeMap$type6.systemOrder]), {}, {
19282
+ kmkfUtils.pushGyLog('getOrderList', {
19283
+ before: value,
19284
+ after: _objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, (_typeMap$type5 = typeMap$4[type]) === null || _typeMap$type5 === void 0 ? void 0 : _typeMap$type5.systemOrder, _objectSpread2(_objectSpread2({}, value[(_typeMap$type6 = typeMap$4[type]) === null || _typeMap$type6 === void 0 ? void 0 : _typeMap$type6.systemOrder]), {}, {
19285
+ showOrderInfo: showOrderInfo,
19286
+ orders: orders
19287
+ })))
19288
+ });
19289
+ onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, (_typeMap$type7 = typeMap$4[type]) === null || _typeMap$type7 === void 0 ? void 0 : _typeMap$type7.systemOrder, _objectSpread2(_objectSpread2({}, value[(_typeMap$type8 = typeMap$4[type]) === null || _typeMap$type8 === void 0 ? void 0 : _typeMap$type8.systemOrder]), {}, {
19272
19290
  showOrderInfo: showOrderInfo,
19273
19291
  orders: orders
19274
19292
  }))));
@@ -19284,39 +19302,41 @@ var GyReissue = function GyReissue(props) {
19284
19302
  };
19285
19303
  }();
19286
19304
  var changeTypeHandle = function changeTypeHandle(val) {
19287
- var _value$typeMap$type$t, _typeMap$type7, _typeMap$type8;
19305
+ var _value$typeMap$type$t, _typeMap$type9, _typeMap$type10;
19306
+ kmkfUtils.pushGyLog('beforeChangeType', value);
19288
19307
  var typeName = val === null || val === void 0 ? void 0 : val[0];
19289
- if (typeName === (value === null || value === void 0 ? void 0 : (_value$typeMap$type$t = value[(_typeMap$type7 = typeMap$4[type]) === null || _typeMap$type7 === void 0 ? void 0 : _typeMap$type7.typeName]) === null || _value$typeMap$type$t === void 0 ? void 0 : _value$typeMap$type$t[0])) return;
19308
+ if (typeName === (value === null || value === void 0 ? void 0 : (_value$typeMap$type$t = value[(_typeMap$type9 = typeMap$4[type]) === null || _typeMap$type9 === void 0 ? void 0 : _typeMap$type9.typeName]) === null || _value$typeMap$type$t === void 0 ? void 0 : _value$typeMap$type$t[0])) return;
19290
19309
  // const systemOrderNo = value?.[typeMap[type]?.systemOrderNo];
19291
19310
  var newValue = _objectSpread2({}, value);
19292
- newValue[(_typeMap$type8 = typeMap$4[type]) === null || _typeMap$type8 === void 0 ? void 0 : _typeMap$type8.typeName] = val;
19311
+ newValue[(_typeMap$type10 = typeMap$4[type]) === null || _typeMap$type10 === void 0 ? void 0 : _typeMap$type10.typeName] = val;
19293
19312
  if (typeName === '1') {
19294
- var _typeMap$type9;
19295
- newValue[(_typeMap$type9 = typeMap$4[type]) === null || _typeMap$type9 === void 0 ? void 0 : _typeMap$type9.key] = getGoodDetails({
19313
+ var _typeMap$type11;
19314
+ newValue[(_typeMap$type11 = typeMap$4[type]) === null || _typeMap$type11 === void 0 ? void 0 : _typeMap$type11.key] = getGoodDetails({
19296
19315
  mode: isStrict
19297
19316
  });
19298
19317
  } else if (typeName === '2') {
19299
- var _typeMap$type10;
19318
+ var _typeMap$type12;
19300
19319
  // 切换到非原单，清空列表
19301
- newValue[(_typeMap$type10 = typeMap$4[type]) === null || _typeMap$type10 === void 0 ? void 0 : _typeMap$type10.key] = [];
19320
+ newValue[(_typeMap$type12 = typeMap$4[type]) === null || _typeMap$type12 === void 0 ? void 0 : _typeMap$type12.key] = [];
19302
19321
  }
19322
+ kmkfUtils.pushGyLog('afterChangeType', newValue);
19303
19323
  onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
19304
19324
  };
19305
19325
  var handleModeChange = function handleModeChange(mode) {
19306
- var _value$typeMap$type$t2, _typeMap$type11, _typeMap$type12;
19307
- var isOriginalOrder = (value === null || value === void 0 ? void 0 : (_value$typeMap$type$t2 = value[(_typeMap$type11 = typeMap$4[type]) === null || _typeMap$type11 === void 0 ? void 0 : _typeMap$type11.typeName]) === null || _value$typeMap$type$t2 === void 0 ? void 0 : _value$typeMap$type$t2[0]) === '1';
19326
+ var _value$typeMap$type$t2, _typeMap$type13, _typeMap$type14;
19327
+ var isOriginalOrder = (value === null || value === void 0 ? void 0 : (_value$typeMap$type$t2 = value[(_typeMap$type13 = typeMap$4[type]) === null || _typeMap$type13 === void 0 ? void 0 : _typeMap$type13.typeName]) === null || _value$typeMap$type$t2 === void 0 ? void 0 : _value$typeMap$type$t2[0]) === '1';
19308
19328
  setIsStrict(mode);
19309
19329
  if (!isOriginalOrder) return;
19310
- onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, (_typeMap$type12 = typeMap$4[type]) === null || _typeMap$type12 === void 0 ? void 0 : _typeMap$type12.key, getGoodDetails({
19330
+ onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, (_typeMap$type14 = typeMap$4[type]) === null || _typeMap$type14 === void 0 ? void 0 : _typeMap$type14.key, getGoodDetails({
19311
19331
  mode: mode
19312
19332
  }))));
19313
19333
  };
19314
19334
  var getGoodDetails = function getGoodDetails(_ref3) {
19315
- var _typeMap$type13, _typeMap$type14, _order$details;
19335
+ var _typeMap$type15, _typeMap$type16, _order$details;
19316
19336
  var mode = _ref3.mode,
19317
19337
  sysOrderNo = _ref3.sysOrderNo;
19318
- var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type13 = typeMap$4[type]) === null || _typeMap$type13 === void 0 ? void 0 : _typeMap$type13.systemOrder];
19319
- var systemOrderNo = sysOrderNo !== null && sysOrderNo !== void 0 ? sysOrderNo : value === null || value === void 0 ? void 0 : value[(_typeMap$type14 = typeMap$4[type]) === null || _typeMap$type14 === void 0 ? void 0 : _typeMap$type14.systemOrderNo];
19338
+ var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type15 = typeMap$4[type]) === null || _typeMap$type15 === void 0 ? void 0 : _typeMap$type15.systemOrder];
19339
+ var systemOrderNo = sysOrderNo !== null && sysOrderNo !== void 0 ? sysOrderNo : value === null || value === void 0 ? void 0 : value[(_typeMap$type16 = typeMap$4[type]) === null || _typeMap$type16 === void 0 ? void 0 : _typeMap$type16.systemOrderNo];
19320
19340
  var order = systemOrderNo && ((systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || []).find(function (order) {
19321
19341
  return order.code === systemOrderNo;
19322
19342
  });
@@ -19327,52 +19347,58 @@ var GyReissue = function GyReissue(props) {
19327
19347
  }) : goodDetails;
19328
19348
  };
19329
19349
  var changeGoodHandle = function changeGoodHandle(val) {
19330
- var _typeMap$type15;
19350
+ var _typeMap$type17;
19351
+ kmkfUtils.pushGyLog('beforeChangeGood', value);
19331
19352
  var newValue = _objectSpread2({}, value);
19332
- newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type15 = typeMap$4[type]) === null || _typeMap$type15 === void 0 ? void 0 : _typeMap$type15.key)] = (val || []).map(function (item) {
19333
- var _typeMap$type16, _typeMap$type17;
19334
- item["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type16 = typeMap$4[type]) === null || _typeMap$type16 === void 0 ? void 0 : _typeMap$type16.formatDefaultField.money)] = 0;
19335
- item["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type17 = typeMap$4[type]) === null || _typeMap$type17 === void 0 ? void 0 : _typeMap$type17.formatDefaultField.share)] = 0;
19353
+ newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type17 = typeMap$4[type]) === null || _typeMap$type17 === void 0 ? void 0 : _typeMap$type17.key)] = (val || []).map(function (item) {
19354
+ var _typeMap$type18, _typeMap$type19;
19355
+ item["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type18 = typeMap$4[type]) === null || _typeMap$type18 === void 0 ? void 0 : _typeMap$type18.formatDefaultField.money)] = 0;
19356
+ item["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type19 = typeMap$4[type]) === null || _typeMap$type19 === void 0 ? void 0 : _typeMap$type19.formatDefaultField.share)] = 0;
19336
19357
  return item;
19337
19358
  });
19359
+ kmkfUtils.pushGyLog('afterChangeGood', newValue);
19338
19360
  onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
19339
19361
  };
19340
19362
  var changeSystemOrderHandle = function changeSystemOrderHandle(val) {
19341
- var _typeMap$type18, _value$typeMap$type$t3, _typeMap$type19, _value$typeMap$type$t4, _typeMap$type21;
19363
+ var _typeMap$type20, _value$typeMap$type$t3, _typeMap$type21, _value$typeMap$type$t4, _typeMap$type23;
19364
+ kmkfUtils.pushGyLog('beforeChangeSystemOrder', value);
19342
19365
  var newValue = _objectSpread2({}, value);
19343
- newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type18 = typeMap$4[type]) === null || _typeMap$type18 === void 0 ? void 0 : _typeMap$type18.systemOrderNo)] = val;
19344
- if (['2'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t3 = value[(_typeMap$type19 = typeMap$4[type]) === null || _typeMap$type19 === void 0 ? void 0 : _typeMap$type19.typeName]) === null || _value$typeMap$type$t3 === void 0 ? void 0 : _value$typeMap$type$t3[0])) {
19345
- var _typeMap$type20;
19346
- newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type20 = typeMap$4[type]) === null || _typeMap$type20 === void 0 ? void 0 : _typeMap$type20.key)] = [];
19347
- } else if (['1'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t4 = value[(_typeMap$type21 = typeMap$4[type]) === null || _typeMap$type21 === void 0 ? void 0 : _typeMap$type21.typeName]) === null || _value$typeMap$type$t4 === void 0 ? void 0 : _value$typeMap$type$t4[0])) {
19366
+ newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type20 = typeMap$4[type]) === null || _typeMap$type20 === void 0 ? void 0 : _typeMap$type20.systemOrderNo)] = val;
19367
+ if (['2'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t3 = value[(_typeMap$type21 = typeMap$4[type]) === null || _typeMap$type21 === void 0 ? void 0 : _typeMap$type21.typeName]) === null || _value$typeMap$type$t3 === void 0 ? void 0 : _value$typeMap$type$t3[0])) {
19348
19368
  var _typeMap$type22;
19349
- newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type22 = typeMap$4[type]) === null || _typeMap$type22 === void 0 ? void 0 : _typeMap$type22.key)] = getGoodDetails({
19369
+ newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type22 = typeMap$4[type]) === null || _typeMap$type22 === void 0 ? void 0 : _typeMap$type22.key)] = [];
19370
+ } else if (['1'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t4 = value[(_typeMap$type23 = typeMap$4[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.typeName]) === null || _value$typeMap$type$t4 === void 0 ? void 0 : _value$typeMap$type$t4[0])) {
19371
+ var _typeMap$type24;
19372
+ newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type24 = typeMap$4[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.key)] = getGoodDetails({
19350
19373
  mode: isStrict,
19351
19374
  sysOrderNo: val
19352
19375
  });
19353
19376
  }
19377
+ kmkfUtils.pushGyLog('afterChangeSystemOrder', newValue);
19354
19378
  onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
19355
19379
  };
19356
19380
  var selectedGoodsChange = React.useCallback(function (skuList) {
19357
- var _typeMap$type23, _typeMap$type24, _uniqBy, _typeMap$type25;
19381
+ var _typeMap$type25, _typeMap$type26, _uniqBy, _typeMap$type27;
19382
+ kmkfUtils.pushGyLog('beforeSelectedGoodsChange', value);
19358
19383
  var newValue = _objectSpread2({}, value);
19359
19384
  // 原订单商品
19360
19385
  var originTradeGoodList = getGoodDetails({
19361
19386
  mode: isStrict
19362
19387
  }) || [];
19363
19388
  // 当前选中的所有商品【包含了原订单+商品库】
19364
- var currentSelectGoodList = (value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type23 = typeMap$4[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.key)]) || [];
19365
- newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type24 = typeMap$4[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.key)] = (_uniqBy = lodash.uniqBy(originTradeGoodList.concat(currentSelectGoodList), 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
19389
+ var currentSelectGoodList = (value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type25 = typeMap$4[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.key)]) || [];
19390
+ newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type26 = typeMap$4[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.key)] = (_uniqBy = lodash.uniqBy(originTradeGoodList.concat(currentSelectGoodList), 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
19366
19391
  return skuList.includes(item.uuid);
19367
19392
  });
19368
- console.log('商品发生变化', newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type25 = typeMap$4[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.key)]);
19393
+ console.log('商品发生变化', newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type27 = typeMap$4[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.key)]);
19369
19394
  onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
19370
- }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type26 = typeMap$4[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.key)], isStrict]);
19395
+ kmkfUtils.pushGyLog('afterSelectedGoodsChange', newValue);
19396
+ }, [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]);
19371
19397
  //系统单选择后展示选择商品按钮，系统单未选择的时候不展示
19372
19398
  var showChangeBtn = React.useMemo(function () {
19373
- var _typeMap$type27;
19374
- return !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type27 = typeMap$4[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.systemOrderNo]);
19375
- }, [value === null || value === void 0 ? void 0 : value[(_typeMap$type28 = typeMap$4[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.systemOrderNo]]);
19399
+ var _typeMap$type29;
19400
+ return !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type29 = typeMap$4[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.systemOrderNo]);
19401
+ }, [value === null || value === void 0 ? void 0 : value[(_typeMap$type30 = typeMap$4[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.systemOrderNo]]);
19376
19402
  return /*#__PURE__*/React__default['default'].createElement("div", {
19377
19403
  id: "TEST_GY",
19378
19404
  onClick: function onClick() {
@@ -19395,12 +19421,12 @@ var GyReissue = function GyReissue(props) {
19395
19421
  },
19396
19422
  disabled: disabled,
19397
19423
  allowClear: false,
19398
- value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type29 = typeMap$4[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.systemOrderNo)],
19424
+ value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type31 = typeMap$4[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.systemOrderNo)],
19399
19425
  onChange: function onChange(val) {
19400
19426
  return changeSystemOrderHandle(val);
19401
19427
  },
19402
19428
  placeholder: "\u9009\u62E9\u8865\u53D1\u7CFB\u7EDF\u5355"
19403
- }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s5 = value[(_typeMap$type30 = typeMap$4[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.systemOrder]) === null || _value$typeMap$type$s5 === void 0 ? void 0 : _value$typeMap$type$s5.showOrderInfo) || []).map(function (item) {
19429
+ }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s5 = value[(_typeMap$type32 = typeMap$4[type]) === null || _typeMap$type32 === void 0 ? void 0 : _typeMap$type32.systemOrder]) === null || _value$typeMap$type$s5 === void 0 ? void 0 : _value$typeMap$type$s5.showOrderInfo) || []).map(function (item) {
19404
19430
  return /*#__PURE__*/React__default['default'].createElement(antd.Select.Option, {
19405
19431
  key: item.billNo,
19406
19432
  value: item.billNo,
@@ -19421,7 +19447,7 @@ var GyReissue = function GyReissue(props) {
19421
19447
  disabled: disabled,
19422
19448
  allowClear: false,
19423
19449
  options: reasonList,
19424
- value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type31 = typeMap$4[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.typeName)],
19450
+ value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type33 = typeMap$4[type]) === null || _typeMap$type33 === void 0 ? void 0 : _typeMap$type33.typeName)],
19425
19451
  onChange: function onChange(val) {
19426
19452
  return changeTypeHandle(val);
19427
19453
  }
@@ -19433,7 +19459,7 @@ var GyReissue = function GyReissue(props) {
19433
19459
  canUpdateNumber: showChangeBtn,
19434
19460
  showChangeBtn: showChangeBtn,
19435
19461
  shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
19436
- value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type32 = typeMap$4[type]) === null || _typeMap$type32 === void 0 ? void 0 : _typeMap$type32.key)],
19462
+ 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)],
19437
19463
  onChange: function onChange(val) {
19438
19464
  return changeGoodHandle(val);
19439
19465
  },
package/dist/src/bs/component/GoodItem/index.d.ts CHANGED
@@ -18,6 +18,7 @@ interface BsGoodsProps {
18
18
  showChangeBtn: boolean;
19
19
  showErpGoodsBtn: boolean;
20
20
  showModeBtn: boolean;
21
+ alwaysShowChooseErpGoodsBtn?: boolean;
21
22
  isStrict: boolean;
22
23
  tableSelect?: boolean;
23
24
  selectType?: string;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/basic-components",
3
- "version": "2.0.19-beta.1",
3
+ "version": "2.0.19-beta.11",
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.19-beta.0",
23
+ "@kmkf-fe-packages/kmkf-utils": "2.0.19-beta.10",
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": "92f1d1fa89d7b1798b11e4bebdd679a4fa8987d4"
68
+ "gitHead": "a27807137c01b6ecc8862ba520486a9b8fe8fe01"
69
69
  }