@kmkf-fe-packages/basic-components 2.2.44-beta.0 → 2.2.44-beta.101

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.js CHANGED
@@ -7774,7 +7774,9 @@ var Province = function Province(props) {
7774
7774
  gy: kmkfUtils.GyAddressData.getInstance(),
7775
7775
  km: kmkfUtils.AddressData.getInstance(),
7776
7776
  jst: kmkfUtils.JstAddressData.getInstance()
7777
+ // jky: JkyAddressData.getInstance(),
7777
7778
  };
7779
+
7778
7780
  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Cascader, _objectSpread2(_objectSpread2({}, props), {}, {
7779
7781
  options: ((_mapping$type = mapping[type]) === null || _mapping$type === void 0 ? void 0 : _mapping$type.addressOptions) || [],
7780
7782
  style: {
@@ -7949,7 +7951,8 @@ var IdentifyAddress = function IdentifyAddress(props) {
7949
7951
  placeholder: "\u6536\u4EF6\u4EBA\u59D3\u540D",
7950
7952
  allowClear: true,
7951
7953
  onChange: function onChange(e) {
7952
- return changeHandle(e.target.value, 'receiverName');
7954
+ var _e$target$value;
7955
+ return changeHandle((_e$target$value = e.target.value) === null || _e$target$value === void 0 ? void 0 : _e$target$value.trim(), 'receiverName');
7953
7956
  }
7954
7957
  }), /*#__PURE__*/React__default['default'].createElement(antd.Input, {
7955
7958
  value: value.receiverMobile,
@@ -7957,7 +7960,8 @@ var IdentifyAddress = function IdentifyAddress(props) {
7957
7960
  allowClear: true,
7958
7961
  placeholder: "\u6536\u4EF6\u4EBA\u7535\u8BDD",
7959
7962
  onChange: function onChange(e) {
7960
- return changeHandle(e.target.value, 'receiverMobile');
7963
+ var _e$target$value2;
7964
+ return changeHandle((_e$target$value2 = e.target.value) === null || _e$target$value2 === void 0 ? void 0 : _e$target$value2.trim(), 'receiverMobile');
7961
7965
  }
7962
7966
  })), /*#__PURE__*/React__default['default'].createElement(antd.Space, {
7963
7967
  wrap: true
@@ -7974,7 +7978,8 @@ var IdentifyAddress = function IdentifyAddress(props) {
7974
7978
  placeholder: "\u8BE6\u7EC6\u5730\u5740",
7975
7979
  allowClear: true,
7976
7980
  onChange: function onChange(e) {
7977
- return changeHandle(e.target.value, 'detail');
7981
+ var _e$target$value3;
7982
+ return changeHandle((_e$target$value3 = e.target.value) === null || _e$target$value3 === void 0 ? void 0 : _e$target$value3.trim(), 'detail');
7978
7983
  }
7979
7984
  })));
7980
7985
  };
@@ -8010,13 +8015,14 @@ function ApaasPosting(props) {
8010
8015
  });
8011
8016
  }
8012
8017
 
8013
- var _excluded$b = ["value", "onChange", "platformType", "type"];
8018
+ var _excluded$b = ["value", "onChange", "platformType", "type", "placement"];
8014
8019
  function ApaasLogistics(props) {
8015
8020
  var value = props.value,
8016
8021
  onChange = props.onChange,
8017
8022
  platformType = props.platformType,
8018
8023
  _props$type = props.type,
8019
8024
  type = _props$type === void 0 ? 'select' : _props$type,
8025
+ placement = props.placement,
8020
8026
  other = _objectWithoutProperties(props, _excluded$b);
8021
8027
  var _useState = React.useState([]),
8022
8028
  _useState2 = _slicedToArray(_useState, 2),
@@ -8054,12 +8060,13 @@ function ApaasLogistics(props) {
8054
8060
  return type === 'input' ? /*#__PURE__*/React__default['default'].createElement(antd.Input, _objectSpread2(_objectSpread2({}, other), {}, {
8055
8061
  value: value,
8056
8062
  onChange: handleInputChange
8057
- })) : /*#__PURE__*/React__default['default'].createElement(antd.Select, _objectSpread2(_objectSpread2({}, other), {}, {
8063
+ })) : /*#__PURE__*/React__default['default'].createElement(antd.Select, _objectSpread2({
8058
8064
  value: value,
8059
8065
  onChange: onChange,
8060
8066
  options: option,
8061
- virtual: true
8062
- }));
8067
+ virtual: true,
8068
+ placement: placement
8069
+ }, other));
8063
8070
  }
8064
8071
 
8065
8072
  var _excluded$c = ["label", "name", "extra", "required", "rules", "initialValue"];
@@ -8143,6 +8150,11 @@ var systemOrderMap = {
8143
8150
  ids: 'wdtSystemSelectIds',
8144
8151
  order: 'wdtSystemShowOrder'
8145
8152
  },
8153
+ JKY_SYSTEM_ORDER: {
8154
+ no: 'jkySystemOrderNo',
8155
+ ids: 'jkySystemSelectIds',
8156
+ order: 'jkySystemShowOrder'
8157
+ },
8146
8158
  BS_E3_SYSTEM_ORDER: {
8147
8159
  no: 'bsE3SystemOrderNo',
8148
8160
  ids: 'bsE3SystemSelectIds',
@@ -8620,7 +8632,8 @@ var processSceneStatus = function processSceneStatus(getValue) {
8620
8632
  WAREHOUSING_STATUS: 'inStockStatusItemList',
8621
8633
  BS_E3_WAREHOUSING_STATUS: 'bsE3InStockStatusItemList',
8622
8634
  MSG_STATUS: 'msgStatusValues',
8623
- WDT_WAREHOUSING_STATUS: 'wdtInStockStatusItemList'
8635
+ WDT_WAREHOUSING_STATUS: 'wdtInStockStatusItemList',
8636
+ JKY_WAREHOUSING_STATUS: 'jkyInStockStatusItemList'
8624
8637
  };
8625
8638
  return _defineProperty({}, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_").concat(STATUS_LIST_MAP[nex.workOrderComponentType])), []));
8626
8639
  };
@@ -8688,6 +8701,21 @@ var processErpSendGood = function processErpSendGood(getValue) {
8688
8701
  return _defineProperty({}, nex.uniqueKey, (itemList === null || itemList === void 0 ? void 0 : itemList.length) ? itemList : initValue);
8689
8702
  };
8690
8703
  };
8704
+ var processErpReturnWarehouse = function processErpReturnWarehouse(getValue) {
8705
+ return function (nex, config) {
8706
+ var kmReturnWarehouseMap = {
8707
+ KM_RETURN_WAREHOUSE: {
8708
+ list: 'kmReturnWarehouse'
8709
+ }
8710
+ };
8711
+ var initValue = [{
8712
+ kmReturnWarehouseName: '',
8713
+ kmReturnWarehouseId: ''
8714
+ }];
8715
+ var itemList = jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_").concat(kmReturnWarehouseMap[nex.workOrderComponentType].list)), initValue);
8716
+ return _defineProperty({}, nex.uniqueKey, (itemList === null || itemList === void 0 ? void 0 : itemList.length) ? itemList : initValue);
8717
+ };
8718
+ };
8691
8719
  var processBsPosting = function processBsPosting(getValue) {
8692
8720
  return function (nex, config) {
8693
8721
  var bsAddress = [transTextToNumber(getValue("".concat(nex.uniqueKey, "_bsPostingProvince"))), transTextToNumber(getValue("".concat(nex.uniqueKey, "_bsPostingCity")))];
@@ -8714,6 +8742,33 @@ var processBsGoods = function processBsGoods(getValue) {
8714
8742
  return _defineProperty({}, nex.uniqueKey, _values);
8715
8743
  };
8716
8744
  };
8745
+ var processJkyGoods = function processJkyGoods(templateColumns) {
8746
+ return function (getValue) {
8747
+ return function (nex, config) {
8748
+ var _values = {
8749
+ jkyGoods: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_jkyGoods")), []),
8750
+ shopCode: getValue("".concat(nex.uniqueKey, "_shopCode"))
8751
+ };
8752
+ var selectIds = [];
8753
+ var orderNo = '';
8754
+ var tradeId = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
8755
+ return col.workOrderComponentType === 'TRADE_ID_INPUT';
8756
+ });
8757
+ if (tradeId) {
8758
+ orderNo = getValue("".concat(tradeId.uniqueKey, "_").concat(updateWorkTypeKeys[tradeId.workOrderComponentType]));
8759
+ }
8760
+ var jkySystemOrder = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
8761
+ return col.workOrderComponentType === 'JKY_SYSTEM_ORDER';
8762
+ });
8763
+ if (jkySystemOrder) {
8764
+ selectIds = jsonParseSecurity(getValue("".concat(jkySystemOrder.uniqueKey, "_").concat(systemOrderMap[jkySystemOrder.workOrderComponentType].ids)), []);
8765
+ }
8766
+ _values.selectIds = selectIds;
8767
+ _values.orderNo = orderNo;
8768
+ return _defineProperty({}, nex.uniqueKey, _values);
8769
+ };
8770
+ };
8771
+ };
8717
8772
  var processWdtGoods = function processWdtGoods(templateColumns) {
8718
8773
  return function (getValue) {
8719
8774
  return function (nex, config) {
@@ -8960,6 +9015,14 @@ var processWdtExchangeGoods = function processWdtExchangeGoods(getValue) {
8960
9015
  });
8961
9016
  };
8962
9017
  };
9018
+ var processKmExchangeGoods = function processKmExchangeGoods(getValue) {
9019
+ return function (nex, config) {
9020
+ return _defineProperty({}, nex.uniqueKey, {
9021
+ kmExchangeGoods: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_kmExchangeGoods")), []),
9022
+ shopCode: getValue("".concat(nex.uniqueKey, "_shopCode"))
9023
+ });
9024
+ };
9025
+ };
8963
9026
  var processJstExchangeGoods = function processJstExchangeGoods(getValue) {
8964
9027
  return function (nex, config) {
8965
9028
  return _defineProperty({}, nex.uniqueKey, {
@@ -9005,6 +9068,11 @@ var processErpSystemOrder = function processErpSystemOrder(getValue) {
9005
9068
  ids: 'wdtSystemSelectIds',
9006
9069
  order: 'wdtSystemShowOrder'
9007
9070
  },
9071
+ JKY_SYSTEM_ORDER: {
9072
+ no: 'jkySystemOrderNo',
9073
+ ids: 'jkySystemSelectIds',
9074
+ order: 'jkySystemShowOrder'
9075
+ },
9008
9076
  BS_E3_SYSTEM_ORDER: {
9009
9077
  no: 'bsE3SystemOrderNo',
9010
9078
  ids: 'bsE3SystemSelectIds',
@@ -9171,6 +9239,28 @@ var processKmReissueGoods = function processKmReissueGoods(templateColumns) {
9171
9239
  };
9172
9240
  };
9173
9241
  };
9242
+ var processKmReturnGoods = function processKmReturnGoods(templateColumns) {
9243
+ return function (getValue) {
9244
+ return function (nex, config) {
9245
+ var orderNo = '';
9246
+ var tradeId = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
9247
+ return col.workOrderComponentType === 'TRADE_ID_INPUT';
9248
+ });
9249
+ if (tradeId) {
9250
+ orderNo = getValue("".concat(tradeId.uniqueKey, "_").concat(updateWorkTypeKeys[tradeId.workOrderComponentType]));
9251
+ }
9252
+ return _defineProperty({}, nex.uniqueKey, {
9253
+ kmSystemOrder: {
9254
+ orderNo: orderNo
9255
+ },
9256
+ kmReturnType: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_kmReturnType")), !kmkfUtils.isNull(config === null || config === void 0 ? void 0 : config.initReason) ? [config.initReason] : ['1']),
9257
+ kmReturnGoods: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_kmReturnGoods")), []),
9258
+ shopCode: getValue("".concat(nex.uniqueKey, "_shopCode")),
9259
+ kmSystemOrderNo: getValue("".concat(nex.uniqueKey, "_kmSystemOrderNo"))
9260
+ });
9261
+ };
9262
+ };
9263
+ };
9174
9264
  var processGyReissueGoods = function processGyReissueGoods(templateColumns) {
9175
9265
  return function (getValue) {
9176
9266
  return function (nex, config) {
@@ -9264,14 +9354,14 @@ var processJstReturnGoods = function processJstReturnGoods(templateColumns) {
9264
9354
  };
9265
9355
  var processLabel = function processLabel(getValue) {
9266
9356
  return function (nex, config) {
9267
- var _ref73;
9268
- return _ref73 = {}, _defineProperty(_ref73, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _defineProperty(_ref73, "".concat(nex.uniqueKey, "_label"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _ref73;
9357
+ var _ref77;
9358
+ return _ref77 = {}, _defineProperty(_ref77, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _defineProperty(_ref77, "".concat(nex.uniqueKey, "_label"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _ref77;
9269
9359
  };
9270
9360
  };
9271
9361
  var processMemberLevel = function processMemberLevel(getValue) {
9272
9362
  return function (nex, config) {
9273
- var _ref74;
9274
- return _ref74 = {}, _defineProperty(_ref74, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _defineProperty(_ref74, "".concat(nex.uniqueKey, "_memberLevel"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _ref74;
9363
+ var _ref78;
9364
+ return _ref78 = {}, _defineProperty(_ref78, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _defineProperty(_ref78, "".concat(nex.uniqueKey, "_memberLevel"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _ref78;
9275
9365
  };
9276
9366
  };
9277
9367
  var processAfterSalesOrderId = function processAfterSalesOrderId(getValue) {
@@ -9375,6 +9465,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
9375
9465
  BS_E3_WAREHOUSING_STATUS: processSceneStatus,
9376
9466
  MSG_STATUS: processSceneStatus,
9377
9467
  WDT_WAREHOUSING_STATUS: processSceneStatus,
9468
+ JKY_WAREHOUSING_STATUS: processSceneStatus,
9378
9469
  BS_LOGISTICS: processErpLogistics,
9379
9470
  WLN_LOGISTICS: processErpLogistics,
9380
9471
  WDT_LOGISTICS: processErpLogistics,
@@ -9387,19 +9478,23 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
9387
9478
  BS_E3_SEND_GOOD: processErpSendGood,
9388
9479
  KM_SEND_GOOD: processErpSendGood,
9389
9480
  GY_SEND_GOOD: processErpSendGood,
9481
+ KM_RETURN_WAREHOUSE: processErpReturnWarehouse,
9390
9482
  BS_POSTING: processBsPosting,
9391
9483
  BS_GOODS: processBsGoods,
9392
9484
  WDT_GOODS: processWdtGoods(templateColumns),
9485
+ JKY_GOODS: processJkyGoods(templateColumns),
9393
9486
  WDT_AFTERSALE_GOODS: processWdtAftersaleGoods(templateColumns),
9394
9487
  JST_AFTERSALE_GOODS: processJstAftersaleGoods(templateColumns),
9395
9488
  BS_E3_GOODS: processBsE3Goods(templateColumns),
9396
9489
  GY_GOODS: processGyGoods(templateColumns),
9397
9490
  KM_GOODS: processKmGoods(templateColumns),
9398
9491
  KM_REISSUE_GOODS: processKmReissueGoods(templateColumns),
9492
+ KM_RETURN_GOODS: processKmReturnGoods(templateColumns),
9399
9493
  JST_GOODS: processJstGoods(templateColumns),
9400
9494
  BS_REISSUE_GOODS: processBsReissueGoods,
9401
9495
  BS_EXCHANGE_GOODS: processBsExchangeGoods,
9402
9496
  WDT_EXCHANGE_GOODS: processWdtExchangeGoods,
9497
+ KM_EXCHANGE_GOODS: processKmExchangeGoods,
9403
9498
  JST_EXCHANGE_GOODS: processJstExchangeGoods,
9404
9499
  BS_RETURN_GOODS: processBsReturnGoods,
9405
9500
  WDT_RETURN_GOODS: processWdtReturnGoods(),
@@ -9408,6 +9503,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
9408
9503
  KM_SYSTEM_ORDER: processErpSystemOrder,
9409
9504
  WLN_SYSTEM_ORDER: processErpSystemOrder,
9410
9505
  WDT_SYSTEM_ORDER: processErpSystemOrder,
9506
+ JKY_SYSTEM_ORDER: processErpSystemOrder,
9411
9507
  WDT_RETURN_BILL_NO: processErpSystemOrder,
9412
9508
  BS_E3_SYSTEM_ORDER: processErpSystemOrder,
9413
9509
  JST_SYSTEM_ORDER: processErpSystemOrder,
@@ -10004,12 +10100,21 @@ var EditSplitRenderMap = {
10004
10100
  updateHandle = _ref17.updateHandle,
10005
10101
  disabled = _ref17.disabled;
10006
10102
  return /*#__PURE__*/React__default['default'].createElement(ApaasLogistics, {
10103
+ getPopupContainer: function getPopupContainer() {
10104
+ return document.getElementById('subform');
10105
+ },
10007
10106
  value: val,
10008
10107
  allowClear: true,
10108
+ showSearch: true,
10009
10109
  onChange: function onChange(e) {
10010
10110
  return updateHandle(e, index, t.key);
10011
10111
  },
10012
- disabled: t.isEdit || disabled
10112
+ disabled: t.isEdit || disabled,
10113
+ filterOption: function filterOption(input, option) {
10114
+ return option.label.includes(input);
10115
+ },
10116
+ placement: "topLeft",
10117
+ listHeight: 120
10013
10118
  });
10014
10119
  },
10015
10120
  //退货物流-物流公司
@@ -10020,12 +10125,21 @@ var EditSplitRenderMap = {
10020
10125
  updateHandle = _ref18.updateHandle,
10021
10126
  disabled = _ref18.disabled;
10022
10127
  return /*#__PURE__*/React__default['default'].createElement(ApaasLogistics, {
10128
+ getPopupContainer: function getPopupContainer() {
10129
+ return document.getElementById('subform');
10130
+ },
10023
10131
  value: val,
10024
10132
  allowClear: true,
10133
+ showSearch: true,
10025
10134
  onChange: function onChange(e) {
10026
10135
  return updateHandle(e, index, t.key);
10027
10136
  },
10028
- disabled: t.isEdit || disabled
10137
+ disabled: t.isEdit || disabled,
10138
+ filterOption: function filterOption(input, option) {
10139
+ return option.label.includes(input);
10140
+ },
10141
+ placement: "topLeft",
10142
+ listHeight: 120
10029
10143
  });
10030
10144
  }
10031
10145
  };
@@ -10494,7 +10608,11 @@ var SubForm = function SubForm(props) {
10494
10608
  });
10495
10609
  }, [inputValue]);
10496
10610
  var handleOpenChange = function handleOpenChange(newOpen) {
10497
- setOpen(newOpen);
10611
+ if (!['jbCFrJV4m7_trajectoryCompany', '0qFEv9GEyd_returnLogisticsCompany'].includes(selectKey)) {
10612
+ setOpen(newOpen);
10613
+ } else {
10614
+ setOpen(false);
10615
+ }
10498
10616
  };
10499
10617
  var onChangeInput = React.useCallback(lodash.debounce(function (val) {
10500
10618
  setInputValue(val);
@@ -10582,6 +10700,9 @@ var SubForm = function SubForm(props) {
10582
10700
  visible: open,
10583
10701
  onVisibleChange: handleOpenChange
10584
10702
  }, ['0qFEv9GEyd_returnLogisticsCompany', 'jbCFrJV4m7_trajectoryCompany'].includes(selectKey) ? /*#__PURE__*/React__default['default'].createElement(ApaasLogistics, {
10703
+ getPopupContainer: function getPopupContainer() {
10704
+ return document.getElementById('subform');
10705
+ },
10585
10706
  value: undefined,
10586
10707
  onChange: function onChange(val) {
10587
10708
  onChangeInput(val);
@@ -10594,7 +10715,9 @@ var SubForm = function SubForm(props) {
10594
10715
  },
10595
10716
  filterOption: function filterOption(input, option) {
10596
10717
  return option.label.includes(input);
10597
- }
10718
+ },
10719
+ placement: "topLeft",
10720
+ listHeight: 120
10598
10721
  }) : /*#__PURE__*/React__default['default'].createElement(antd.Input, {
10599
10722
  placeholder: "\u8F93\u5165\u5173\u952E\u8BCD\u67E5\u8BE2",
10600
10723
  allowClear: true,
@@ -10671,7 +10794,8 @@ var BuyerNick = function BuyerNick(props) {
10671
10794
  disabled = props.disabled,
10672
10795
  _onBlur = props.onBlur;
10673
10796
  var changeValue = function changeValue(e, type) {
10674
- onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, type, e.target.value)));
10797
+ var _e$target$value;
10798
+ onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, type, (_e$target$value = e.target.value) === null || _e$target$value === void 0 ? void 0 : _e$target$value.trim())));
10675
10799
  };
10676
10800
  // useEffect(() => {
10677
10801
  // //淘宝平台和抖音平台需要展示买家id
@@ -10696,7 +10820,8 @@ var BuyerNick = function BuyerNick(props) {
10696
10820
  changeValue(e, 'buyerNick');
10697
10821
  },
10698
10822
  onBlur: function onBlur(e) {
10699
- _onBlur === null || _onBlur === void 0 ? void 0 : _onBlur(e.target.value, 'buyerNick');
10823
+ var _e$target$value2;
10824
+ _onBlur === null || _onBlur === void 0 ? void 0 : _onBlur((_e$target$value2 = e.target.value) === null || _e$target$value2 === void 0 ? void 0 : _e$target$value2.trim(), 'buyerNick');
10700
10825
  }
10701
10826
  });
10702
10827
  };
@@ -10818,8 +10943,9 @@ var RemarkInput = function RemarkInput(props) {
10818
10943
  onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
10819
10944
  };
10820
10945
  var changeRemark = function changeRemark(e) {
10946
+ var _e$target$value;
10821
10947
  var newValue = _objectSpread2(_objectSpread2({}, value), {}, {
10822
- remark: e.target.value
10948
+ remark: (_e$target$value = e.target.value) === null || _e$target$value === void 0 ? void 0 : _e$target$value.trim()
10823
10949
  });
10824
10950
  onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
10825
10951
  };
@@ -10862,7 +10988,7 @@ var Logistics = function Logistics(props) {
10862
10988
  var handleInputChange = function handleInputChange(e) {
10863
10989
  var val = e.target.value;
10864
10990
  typeof onChange === 'function' && onChange(_objectSpread2(_objectSpread2({}, value), {}, {
10865
- order: val
10991
+ order: val === null || val === void 0 ? void 0 : val.trim()
10866
10992
  }));
10867
10993
  };
10868
10994
  var handelSelectChange = function handelSelectChange(val) {
@@ -10926,7 +11052,8 @@ var AliPay = function AliPay(props) {
10926
11052
  disabled = props.disabled,
10927
11053
  _onBlur = props.onBlur;
10928
11054
  var changeValue = function changeValue(e, type) {
10929
- onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, type, e.target.value)));
11055
+ var _e$target$value;
11056
+ onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, type, (_e$target$value = e.target.value) === null || _e$target$value === void 0 ? void 0 : _e$target$value.trim())));
10930
11057
  };
10931
11058
  return /*#__PURE__*/React__default['default'].createElement("div", null, !isSingle ? /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
10932
11059
  disabled: disabled,
@@ -12113,7 +12240,7 @@ var ChooseBaby = function ChooseBaby(props) {
12113
12240
  }));
12114
12241
  };
12115
12242
 
12116
- var css_248z$7 = "#goods-wrap.goodsBox.single-row {\n max-height: 800px;\n overflow-y: auto;\n padding-top: 4px;\n flex-basis: 100%;\n}\n#goods-wrap.goodsBox.single-row .good-item.rich-item.with-pic,\n#goods-wrap.goodsBox.single-row .good-item.rich-item.with-attr,\n#goods-wrap.goodsBox.single-row .good-item.rich-item.with-attr.with-pic {\n flex-basis: 100%;\n}\n#goods-wrap.goodsBox.single-row .good-item.rich-item .good-attrs {\n flex-grow: 1;\n flex-shrink: 1;\n}\n#goods-wrap.goodsBox.single-row .good-item.rich-item .good-attrs .good-item-attr {\n flex-grow: 1;\n flex-shrink: 1;\n max-width: 80px;\n width: 20px;\n flex-basis: 20px;\n}\n#goods-wrap.goodsBox.single-row .good-item.rich-item .good-attrs .ant-input {\n flex-shrink: 1;\n flex-grow: 1;\n width: 20px;\n flex-basis: 40px;\n}\n#goods-wrap .good-item.rich-item {\n position: relative;\n border: 1px solid #ccc;\n display: flex;\n flex-basis: 80px;\n flex-wrap: nowrap;\n margin: 0 10px 10px 0;\n padding: 4px;\n}\n#goods-wrap .good-item.rich-item.with-pic {\n flex-basis: 90px;\n}\n#goods-wrap .good-item.rich-item.with-attr {\n flex-basis: 150px;\n}\n#goods-wrap .good-item.rich-item.with-attr.with-pic {\n flex-basis: 238px;\n}\n#goods-wrap .good-item.rich-item.with-attr.with-pic .goods-imgBox {\n margin-right: 8px;\n}\n#goods-wrap .good-item.rich-item .good-item-attr {\n margin-right: 6px;\n width: 52px;\n flex-basis: 52px;\n}\n#goods-wrap .good-item.rich-item .good-img {\n position: relative;\n width: 80px;\n height: 80px;\n border-radius: 4px;\n border: 1px solid #f2f3f5;\n margin: 0 10px 0 0;\n text-align: center;\n background-color: #f2f3f5;\n}\n#goods-wrap .good-item.rich-item .good-attrs {\n display: flex;\n flex-direction: column;\n font-size: 12px;\n}\n#goods-wrap .good-item.rich-item .good-attrs .ant-input {\n font-size: 12px;\n width: 80px;\n height: 20px;\n padding-left: 5px;\n padding-right: 5px;\n}\n#goods-wrap .good-item.rich-item .good-attrs .ant-input.id-textarea {\n width: 80px;\n resize: none;\n height: 45px;\n}\n#goods-wrap .good-item.rich-item .good-attrs div {\n display: flex;\n}\n#goods-wrap .good-item.rich-item .good-attrs div:not(:first-child) {\n margin-top: 4px;\n}\n";
12243
+ var css_248z$7 = "#goods-wrap.goodsBox.single-row {\n max-height: 800px;\n overflow-y: auto;\n padding-top: 4px;\n flex-basis: 100%;\n}\n#goods-wrap.goodsBox.single-row .good-item.rich-item.with-pic,\n#goods-wrap.goodsBox.single-row .good-item.rich-item.with-attr,\n#goods-wrap.goodsBox.single-row .good-item.rich-item.with-attr.with-pic {\n flex-basis: 100%;\n}\n#goods-wrap.goodsBox.single-row .good-item.rich-item .good-attrs {\n flex-grow: 1;\n flex-shrink: 1;\n}\n#goods-wrap.goodsBox.single-row .good-item.rich-item .good-attrs .good-item-attr {\n flex-grow: 1;\n flex-shrink: 1;\n max-width: 80px;\n width: 20px;\n flex-basis: 20px;\n}\n#goods-wrap.goodsBox.single-row .good-item.rich-item .good-attrs .ant-input {\n flex-shrink: 1;\n flex-grow: 1;\n width: 20px;\n flex-basis: 40px;\n}\n#goods-wrap .good-item.rich-item {\n position: relative;\n border: 1px solid #ccc;\n display: flex;\n flex-basis: 80px;\n flex-wrap: nowrap;\n margin: 0 10px 10px 0;\n padding: 4px;\n}\n#goods-wrap .good-item.rich-item.with-pic {\n flex-basis: 90px;\n}\n#goods-wrap .good-item.rich-item.with-attr {\n flex-basis: 150px;\n}\n#goods-wrap .good-item.rich-item.with-attr.with-pic {\n flex-basis: 238px;\n}\n#goods-wrap .good-item.rich-item.with-attr.with-pic .goods-imgBox {\n margin-right: 8px;\n}\n#goods-wrap .good-item.rich-item .good-item-attr {\n margin-right: 6px;\n width: 52px;\n flex-basis: 52px;\n}\n#goods-wrap .good-item.rich-item .good-img {\n position: relative;\n width: 80px;\n height: 80px;\n border-radius: 4px;\n border: 1px solid #f2f3f5;\n margin: 0 10px 0 0;\n text-align: center;\n background-color: #f2f3f5;\n}\n#goods-wrap .good-item.rich-item .good-attrs {\n display: flex;\n flex-direction: column;\n font-size: 12px;\n}\n#goods-wrap .good-item.rich-item .good-attrs .ant-input {\n font-size: 12px;\n width: 80px;\n height: 20px;\n padding-left: 5px;\n padding-right: 5px;\n}\n#goods-wrap .good-item.rich-item .good-attrs .ant-input.id-textarea {\n width: 80px;\n resize: none;\n height: 45px;\n}\n#goods-wrap .good-item.rich-item .good-attrs div {\n display: flex;\n}\n#goods-wrap .good-item.rich-item .good-attrs div:not(:first-child) {\n margin-top: 4px;\n}\n.goods-uploaded-state {\n display: flex;\n}\n.goods-uploaded-state .clear-all {\n float: right;\n color: #1966ff;\n cursor: pointer;\n margin-left: 12px;\n}\n";
12117
12244
  styleInject(css_248z$7);
12118
12245
 
12119
12246
  var GoodItem = function GoodItem(props) {
@@ -12442,13 +12569,22 @@ var GoodItem = function GoodItem(props) {
12442
12569
  var hasAttr = React.useMemo(function () {
12443
12570
  return hasPic ? headerList.length > 1 : headerList.length > 0;
12444
12571
  }, [hasPic, headerList]);
12572
+ var clearAll = function clearAll() {
12573
+ onChange === null || onChange === void 0 ? void 0 : onChange({
12574
+ shopId: shopId,
12575
+ imgList: []
12576
+ });
12577
+ };
12445
12578
  return /*#__PURE__*/React__default['default'].createElement("div", null, imgList.length === 0 ? /*#__PURE__*/React__default['default'].createElement("p", {
12446
12579
  className: "goods-title"
12447
12580
  }, "\u6700\u591A\u6DFB\u52A0", maxLength, "\u4E2A\u5B9D\u8D1D") : /*#__PURE__*/React__default['default'].createElement("p", {
12448
12581
  className: "goods-uploaded-state"
12449
12582
  }, "\u5DF2\u6DFB\u52A0", /*#__PURE__*/React__default['default'].createElement("span", {
12450
12583
  className: "goods-uploaded-count"
12451
- }, imgList.length), "/", maxLength, "\u4E2A\u5B9D\u8D1D"), /*#__PURE__*/React__default['default'].createElement("div", {
12584
+ }, imgList.length), "/", maxLength, /*#__PURE__*/React__default['default'].createElement("span", {
12585
+ className: 'clear-all',
12586
+ onClick: clearAll
12587
+ }, "\u6E05\u7A7A")), /*#__PURE__*/React__default['default'].createElement("div", {
12452
12588
  ref: boxRef,
12453
12589
  id: "goods-wrap",
12454
12590
  className: "goodsBox goodsBox-item-horizontal--box".concat(isSingleRow ? ' single-row' : '')
@@ -12588,7 +12724,8 @@ var Invoice = function Invoice(props) {
12588
12724
  }),
12589
12725
  current = _useRef.current;
12590
12726
  var handleInputChange = function handleInputChange(e) {
12591
- var ordinaryTaitou = e.target.value;
12727
+ var _e$target$value;
12728
+ var ordinaryTaitou = (_e$target$value = e.target.value) === null || _e$target$value === void 0 ? void 0 : _e$target$value.trim();
12592
12729
  setVisible(false);
12593
12730
  setList([]);
12594
12731
  var newValue = _objectSpread2(_objectSpread2({}, value), {}, {
@@ -12611,8 +12748,9 @@ var Invoice = function Invoice(props) {
12611
12748
  handleChange(ordinaryTaitou);
12612
12749
  };
12613
12750
  var handleValueClick = function handleValueClick(e) {
12751
+ var _e$target$value2;
12614
12752
  var newValue = _objectSpread2(_objectSpread2({}, value), {}, {
12615
- ordinarySerial: e.target.value
12753
+ ordinarySerial: (_e$target$value2 = e.target.value) === null || _e$target$value2 === void 0 ? void 0 : _e$target$value2.trim()
12616
12754
  });
12617
12755
  onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2({}, newValue));
12618
12756
  };
@@ -12923,7 +13061,8 @@ var Payment = function Payment(props) {
12923
13061
  // }
12924
13062
  // }, [shopId, shopList]);
12925
13063
  var changeValue = function changeValue(e, type) {
12926
- var newValue = _objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, type, e.target.value));
13064
+ var _e$target$value;
13065
+ var newValue = _objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, type, (_e$target$value = e.target.value) === null || _e$target$value === void 0 ? void 0 : _e$target$value.trim()));
12927
13066
  onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
12928
13067
  type === 'enterprisePaymentTid' && (onSearch === null || onSearch === void 0 ? void 0 : onSearch(e));
12929
13068
  };
@@ -12984,7 +13123,8 @@ var Payment = function Payment(props) {
12984
13123
  return changeValue(e, item.name);
12985
13124
  },
12986
13125
  onBlur: function onBlur(e) {
12987
- return _onBlur === null || _onBlur === void 0 ? void 0 : _onBlur(e.target.value, item.name);
13126
+ var _e$target$value2;
13127
+ return _onBlur === null || _onBlur === void 0 ? void 0 : _onBlur((_e$target$value2 = e.target.value) === null || _e$target$value2 === void 0 ? void 0 : _e$target$value2.trim(), item.name);
12988
13128
  }
12989
13129
  }), (replaceValueCh === null || replaceValueCh === void 0 ? void 0 : replaceValueCh[item.name]) && /*#__PURE__*/React__default['default'].createElement("p", {
12990
13130
  style: {
@@ -13277,7 +13417,8 @@ var LogisticsInterception = function LogisticsInterception(props) {
13277
13417
  disabled: disabled || isEdit,
13278
13418
  placeholder: "\u7269\u6D41\u5355\u53F7",
13279
13419
  onChange: function onChange(e) {
13280
- return changeHandle(e.target.value, 'interceptCode');
13420
+ var _e$target$value;
13421
+ return changeHandle((_e$target$value = e.target.value) === null || _e$target$value === void 0 ? void 0 : _e$target$value.trim(), 'interceptCode');
13281
13422
  },
13282
13423
  value: value === null || value === void 0 ? void 0 : value.interceptCode
13283
13424
  }))), /*#__PURE__*/React__default['default'].createElement(antd.Space, null, /*#__PURE__*/React__default['default'].createElement(Item, {
@@ -13352,7 +13493,8 @@ var LogisticsInterception = function LogisticsInterception(props) {
13352
13493
  disabled: disabled || isEdit,
13353
13494
  placeholder: senderMobileLabel,
13354
13495
  onChange: function onChange(e) {
13355
- return changeHandle(e.target.value, 'interceptSenderMobile');
13496
+ var _e$target$value2;
13497
+ return changeHandle((_e$target$value2 = e.target.value) === null || _e$target$value2 === void 0 ? void 0 : _e$target$value2.trim(), 'interceptSenderMobile');
13356
13498
  }
13357
13499
  })), /*#__PURE__*/React__default['default'].createElement(Item, {
13358
13500
  label: '退回地址',
@@ -13411,7 +13553,8 @@ var LogisticsInterception = function LogisticsInterception(props) {
13411
13553
  },
13412
13554
  placeholder: "\u5176\u4ED6",
13413
13555
  onChange: function onChange(e) {
13414
- return changeHandle(e.target.value, 'interceptLogisticsStatusOther');
13556
+ var _e$target$value3;
13557
+ return changeHandle((_e$target$value3 = e.target.value) === null || _e$target$value3 === void 0 ? void 0 : _e$target$value3.trim(), 'interceptLogisticsStatusOther');
13415
13558
  }
13416
13559
  })), /*#__PURE__*/React__default['default'].createElement(Item, {
13417
13560
  label: '拦截状态',
@@ -13465,7 +13608,8 @@ var LogisticsInterception = function LogisticsInterception(props) {
13465
13608
  disabled: true,
13466
13609
  placeholder: "\u63A5\u53E3\u72B6\u6001\u539F\u56E0",
13467
13610
  onChange: function onChange(e) {
13468
- return changeHandle(e.target.value, 'interceptLogisticsApiStatusReason');
13611
+ var _e$target$value4;
13612
+ return changeHandle((_e$target$value4 = e.target.value) === null || _e$target$value4 === void 0 ? void 0 : _e$target$value4.trim(), 'interceptLogisticsApiStatusReason');
13469
13613
  }
13470
13614
  })));
13471
13615
  };
@@ -13541,7 +13685,7 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
13541
13685
  trajectoryApiStatus = _props$trajectoryApiS === void 0 ? false : _props$trajectoryApiS;
13542
13686
  var handleInputChange = function handleInputChange(e, type) {
13543
13687
  var val = e.target.value;
13544
- typeof onChange === 'function' && onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, type, val)));
13688
+ typeof onChange === 'function' && onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, type, val === null || val === void 0 ? void 0 : val.trim())));
13545
13689
  };
13546
13690
  var handelSelectChange = function handelSelectChange(val) {
13547
13691
  typeof onChange === 'function' && onChange(_objectSpread2(_objectSpread2({}, value), {}, {
@@ -13941,10 +14085,14 @@ var typeInitValueMap = {
13941
14085
  }],
13942
14086
  4: [{
13943
14087
  deliveryNo: null
14088
+ }],
14089
+ 5: [{
14090
+ returnWarehouseName: null,
14091
+ returnWarehouseId: null
13944
14092
  }]
13945
14093
  };
13946
14094
  var jstGoods = function jstGoods(props) {
13947
- var _value$changeIndex, _value$changeIndex2, _value$changeIndex3, _value$changeIndex4, _value$changeIndex5, _value$changeIndex6, _value$changeIndex7, _value$changeIndex8, _value$changeIndex9, _value$changeIndex10, _value$changeIndex11, _value$changeIndex12, _value$changeIndex13;
14095
+ var _value$changeIndex, _value$changeIndex2, _value$changeIndex3, _value$changeIndex4, _value$changeIndex5, _value$changeIndex6, _value$changeIndex7, _value$changeIndex8, _value$changeIndex9, _value$changeIndex10, _value$changeIndex11, _value$changeIndex12, _value$changeIndex13, _value$changeIndex14, _value$changeIndex15, _value$changeIndex16, _value$changeIndex17;
13948
14096
  var _props$value = props.value,
13949
14097
  value = _props$value === void 0 ? [] : _props$value,
13950
14098
  onChange = props.onChange,
@@ -14017,13 +14165,28 @@ var jstGoods = function jstGoods(props) {
14017
14165
  newList[changeIndex] = changeOrderInfo;
14018
14166
  onChange === null || onChange === void 0 ? void 0 : onChange(newList);
14019
14167
  };
14168
+ var handleSelectedReturn = function handleSelectedReturn(val, type, option, onlyShowFieldSelect) {
14169
+ var changeOrderInfo = _objectSpread2({}, value[changeIndex]);
14170
+ changeOrderInfo[type] = val;
14171
+ if (!onlyShowFieldSelect) {
14172
+ changeOrderInfo['returnWarehouseId'] = option.value;
14173
+ }
14174
+ if (isSelectName && type === 'returnWarehouseName') {
14175
+ // 如果发货仓名称存的是name,将id存入快照,同时把id替换成名称
14176
+ changeOrderInfo['sendSnapshotId'] = option.value;
14177
+ changeOrderInfo['returnWarehouseName'] = option.label;
14178
+ }
14179
+ var newList = _toConsumableArray(value);
14180
+ newList[changeIndex] = changeOrderInfo;
14181
+ onChange === null || onChange === void 0 ? void 0 : onChange(newList);
14182
+ };
14020
14183
  var filterOption = function filterOption(input, option) {
14021
14184
  var _option$label;
14022
14185
  return ((_option$label = option === null || option === void 0 ? void 0 : option.label) !== null && _option$label !== void 0 ? _option$label : '').includes(input);
14023
14186
  };
14024
14187
  var changeInputHandle = function changeInputHandle(val, type) {
14025
14188
  var changeOrderInfo = _objectSpread2({}, value[changeIndex]);
14026
- changeOrderInfo[type] = val;
14189
+ changeOrderInfo[type] = val === null || val === void 0 ? void 0 : val.trim();
14027
14190
  var newList = _toConsumableArray(value);
14028
14191
  newList[changeIndex] = changeOrderInfo;
14029
14192
  onChange === null || onChange === void 0 ? void 0 : onChange(newList);
@@ -14131,7 +14294,35 @@ var jstGoods = function jstGoods(props) {
14131
14294
  return changeInputHandle(e.target.value, 'deliveryNo');
14132
14295
  },
14133
14296
  value: (_value$changeIndex13 = value[changeIndex]) === null || _value$changeIndex13 === void 0 ? void 0 : _value$changeIndex13.sendName
14134
- })) : null) : null);
14297
+ })) : null, type === 5 ? /*#__PURE__*/React__default['default'].createElement(antd.Space, null, ['returnWarehouseId', 'all'].includes(showField) && /*#__PURE__*/React__default['default'].createElement(antd.Input, {
14298
+ disabled: disabled,
14299
+ placeholder: "\u8BF7\u8F93\u5165\u9000\u8D27\u4ED3\u7F16\u7801",
14300
+ onChange: function onChange(e) {
14301
+ return changeInputHandle(e.target.value, 'returnWarehouseId');
14302
+ },
14303
+ value: (_value$changeIndex14 = value[changeIndex]) === null || _value$changeIndex14 === void 0 ? void 0 : _value$changeIndex14.returnWarehouseId
14304
+ }), ['returnWarehouseName', 'all'].includes(showField) && (isSelectName ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
14305
+ style: {
14306
+ minWidth: '100px',
14307
+ maxWidth: '180px'
14308
+ },
14309
+ disabled: disabled,
14310
+ placeholder: "\u9000\u8D27\u4ED3\u540D\u79F0",
14311
+ showSearch: true,
14312
+ options: sendOptions,
14313
+ filterOption: filterOption,
14314
+ value: ((_value$changeIndex15 = value[changeIndex]) === null || _value$changeIndex15 === void 0 ? void 0 : _value$changeIndex15.sendSnapshotId) || ((_value$changeIndex16 = value[changeIndex]) === null || _value$changeIndex16 === void 0 ? void 0 : _value$changeIndex16.returnWarehouseName) || null,
14315
+ onChange: function onChange(value, option) {
14316
+ return handleSelectedReturn(value, 'returnWarehouseName', option, onlyShowFieldSelect);
14317
+ }
14318
+ }) : /*#__PURE__*/React__default['default'].createElement(antd.Input, {
14319
+ disabled: disabled,
14320
+ placeholder: "\u8BF7\u8F93\u5165\u9000\u8D27\u4ED3\u540D\u79F0",
14321
+ onChange: function onChange(e) {
14322
+ return changeInputHandle(e.target.value, 'returnWarehouseName');
14323
+ },
14324
+ value: (_value$changeIndex17 = value[changeIndex]) === null || _value$changeIndex17 === void 0 ? void 0 : _value$changeIndex17.returnWarehouseName
14325
+ }))) : null) : null);
14135
14326
  };
14136
14327
 
14137
14328
  var css_248z$a = ".jstGoodsBox {\n display: flex;\n flex-wrap: wrap;\n}\n.jstGoodsBox .goodBox-Img {\n width: 80px;\n margin: 0 10px 10px 0;\n}\n.jstGoodsBox .right-context {\n font-size: 12px;\n}\n.jstGoodsBox .right-context .ant-input {\n font-size: 12px;\n width: 80px;\n height: 20px;\n padding-left: 5px;\n padding-right: 5px;\n}\n.jstGoodsBox .right-context .ant-input.id-textarea {\n width: 80px;\n resize: none;\n height: 45px;\n}\n.jstGoodsBox.goodsBox-item-horizontal--box {\n flex-direction: row;\n width: auto;\n}\n.jstimgBox {\n position: relative;\n width: 80px;\n height: 80px;\n border-radius: 4px;\n border: 1px solid #f2f3f5;\n margin: 0 10px 10px 0;\n text-align: center;\n background-color: #f2f3f5;\n display: flex;\n justify-items: center;\n align-items: center;\n}\n.jstimgBox .add-btn {\n color: #86909c;\n}\n.jstimgBox .text {\n color: #86909c;\n}\n.icon-close {\n position: absolute;\n top: -5px;\n right: -5px;\n width: 13px;\n height: 13px;\n display: flex;\n justify-content: center;\n align-items: center;\n border-radius: 50%;\n z-index: 3;\n background-color: #fff;\n cursor: pointer;\n}\n.img {\n width: 100%;\n height: 100%;\n -o-object-fit: contain;\n object-fit: contain;\n}\n.goods-title {\n margin: 0 0 10px 5px;\n color: #4e5969;\n}\n.searchBox {\n display: flex;\n justify-content: space-between;\n flex-wrap: wrap;\n margin-bottom: 10px;\n}\n.searchBox .search {\n width: 150px;\n margin-left: 6px;\n}\n.deg90 {\n transform: rotate(90deg);\n}\n.goodsMain {\n display: flex;\n flex-wrap: wrap;\n height: 400px;\n overflow-y: auto;\n margin-bottom: 10px;\n}\n.goodsMain .goodItem {\n width: 142px;\n height: 184px;\n padding: 7px;\n margin: 0 16px 16px 0;\n border-radius: 4px;\n background: #ffffff;\n box-sizing: border-box;\n /* 主题色/常规 */\n border: 1px solid #c9cdd4;\n}\n.goodsMain .goodItem .goodImg {\n width: 128px;\n height: 128px;\n border-radius: 4px;\n overflow: hidden;\n}\n.goodsMain .goodItem .goodImg img {\n width: 100%;\n height: 100%;\n -o-object-fit: contain;\n object-fit: contain;\n}\n.goodsMain .goodItem .goodText {\n text-align: center;\n font-size: 12px;\n color: #4e5969;\n overflow: hidden;\n text-overflow: ellipsis;\n white-space: nowrap;\n}\n.goodsMain .goodItem .goodPrice {\n text-align: center;\n font-size: 14px;\n color: #1d2129;\n}\n.goodsMain .goodItem.active {\n border: 1px solid #1b5bf3;\n}\n@media screen and (max-width: 500px) {\n .goodsMain {\n display: grid;\n grid-template-columns: repeat(3, 1fr);\n grid-gap: 8px;\n height: 300px;\n }\n .goodsMain .goodItem {\n height: 126px;\n width: 83px;\n padding: 4px;\n margin: 0;\n border-radius: 4px;\n background: #FFFFFF;\n box-sizing: border-box;\n border: 1px solid rgba(0, 0, 0, 0.15);\n }\n .goodsMain .goodItem .goodImg {\n width: 98%;\n height: 77px;\n }\n .goodsMain .goodItem .goodText {\n overflow: hidden;\n text-overflow: ellipsis;\n white-space: nowrap;\n }\n .goodsMain .goodItem.active {\n border: 1px solid #3089dc;\n }\n .searchBox {\n display: flex;\n flex-wrap: wrap;\n justify-content: initial;\n }\n .searchBox .classify {\n width: 120px;\n }\n .goodModal .ant-modal-body {\n padding: 8px;\n }\n}\n.goods-uploaded-count {\n color: #ff3638;\n}\n.footer {\n display: flex;\n justify-content: flex-end;\n}\n.right-context {\n display: flex;\n flex-direction: column;\n}\n.right-context .info-row {\n width: 80px;\n display: flex;\n align-items: center;\n padding: 0px 8px;\n border-radius: 2px;\n cursor: pointer;\n background: #f2f3f5;\n margin-bottom: 4px;\n}\n.right-context .info-row > div {\n text-overflow: ellipsis;\n display: -webkit-box;\n -webkit-box-orient: vertical;\n -webkit-line-clamp: 2;\n overflow: hidden;\n word-break: break-all;\n}\n.sphPagination {\n display: flex;\n align-items: center;\n}\n.sphPagination .shpBtn {\n display: flex;\n justify-content: center;\n align-items: center;\n padding: 0 8px;\n height: 32px;\n border: 1px solid #d9d9d9;\n border-radius: 2px;\n cursor: pointer;\n margin: 0 8px;\n}\n.sphPagination .shpBtn.unCursor {\n color: #eee;\n cursor: not-allowed;\n}\n";
@@ -14945,6 +15136,13 @@ var wdtColumns = [{
14945
15136
  title: '辅助单位',
14946
15137
  width: 150,
14947
15138
  render: renderTextEllipsis
15139
+ }, {
15140
+ dataIndex: 'skuType',
15141
+ title: '是否组合装',
15142
+ width: 150,
15143
+ render: function render(type) {
15144
+ return type === 'suite' ? '组合装' : '非组合装';
15145
+ }
14948
15146
  }];
14949
15147
 
14950
15148
  var bse3Columns = [{
@@ -15101,7 +15299,9 @@ var kmColumns = [{
15101
15299
  title: "\u5546\u54C1\u7C7B\u578B",
15102
15300
  ellipsis: true,
15103
15301
  width: 150,
15104
- render: renderTextEllipsis
15302
+ render: function render(type) {
15303
+ return renderTextEllipsis((kmkfUtils.kmSkuTypeMap === null || kmkfUtils.kmSkuTypeMap === void 0 ? void 0 : kmkfUtils.kmSkuTypeMap[type]) || type);
15304
+ }
15105
15305
  }, {
15106
15306
  dataIndex: 'specName',
15107
15307
  title: "SKU\u540D\u79F0",
@@ -15333,34 +15533,75 @@ var jyColumns = [{
15333
15533
  }
15334
15534
  }];
15335
15535
 
15536
+ var getYesOrNo$2 = function getYesOrNo(val) {
15537
+ if (!lodash.isBoolean(val)) return null;
15538
+ return val ? '是' : '否';
15539
+ };
15336
15540
  var jkyColumns = [{
15337
- dataIndex: 'goodsNo',
15338
- title: "\u8D27\u54C1\u7F16\u53F7",
15541
+ dataIndex: 'goodName',
15542
+ title: "\u8D27\u54C1\u540D\u79F0",
15339
15543
  align: 'center',
15340
15544
  ellipsis: true,
15341
15545
  width: 150,
15342
15546
  render: renderTextEllipsis
15343
15547
  }, {
15344
- dataIndex: 'goodsName',
15345
- title: "\u8D27\u54C1\u540D\u79F0",
15548
+ dataIndex: 'goodNo',
15549
+ title: "\u8D27\u54C1\u7F16\u53F7",
15346
15550
  align: 'center',
15347
15551
  ellipsis: true,
15348
15552
  width: 150,
15349
15553
  render: renderTextEllipsis
15350
15554
  }, {
15351
- dataIndex: 'goodsId',
15555
+ dataIndex: 'goodId',
15352
15556
  title: "\u8D27\u54C1ID",
15353
15557
  align: 'center',
15354
15558
  ellipsis: true,
15355
15559
  width: 150,
15356
15560
  render: renderTextEllipsis
15357
15561
  }, {
15358
- dataIndex: 'barcode',
15562
+ dataIndex: 'goodPicUrl',
15563
+ title: "\u8D27\u54C1\u4E3B\u56FE",
15564
+ align: 'center',
15565
+ ellipsis: true,
15566
+ width: 150,
15567
+ render: function render(picUrl) {
15568
+ return /*#__PURE__*/React__default['default'].createElement("img", {
15569
+ style: {
15570
+ width: '30px',
15571
+ height: '30px',
15572
+ objectFit: 'contain'
15573
+ },
15574
+ src: picUrl
15575
+ });
15576
+ }
15577
+ }, {
15578
+ dataIndex: 'goodShortName',
15579
+ title: "\u8D27\u54C1\u522B\u540D",
15580
+ align: 'center',
15581
+ ellipsis: true,
15582
+ width: 150,
15583
+ render: renderTextEllipsis
15584
+ }, {
15585
+ dataIndex: 'specBarcode',
15359
15586
  title: "\u8D27\u54C1\u6761\u7801",
15360
15587
  align: 'center',
15361
15588
  ellipsis: true,
15362
15589
  width: 150,
15363
15590
  render: renderTextEllipsis
15591
+ }, {
15592
+ dataIndex: 'categoryName',
15593
+ title: "\u8D27\u54C1\u7C7B\u522B",
15594
+ align: 'center',
15595
+ ellipsis: true,
15596
+ width: 150,
15597
+ render: renderTextEllipsis
15598
+ }, {
15599
+ dataIndex: 'brandName',
15600
+ title: "\u54C1\u724C",
15601
+ align: 'center',
15602
+ ellipsis: true,
15603
+ width: 200,
15604
+ render: renderTextEllipsis
15364
15605
  }, {
15365
15606
  dataIndex: 'specName',
15366
15607
  title: "\u89C4\u683C\u540D\u79F0",
@@ -15376,7 +15617,14 @@ var jkyColumns = [{
15376
15617
  width: 150,
15377
15618
  render: renderTextEllipsis
15378
15619
  }, {
15379
- dataIndex: 'skuImgUrl',
15620
+ dataIndex: 'specNo',
15621
+ title: "\u89C4\u683C\u7F16\u7801",
15622
+ align: 'center',
15623
+ ellipsis: true,
15624
+ width: 150,
15625
+ render: renderTextEllipsis
15626
+ }, {
15627
+ dataIndex: 'specImgUrl',
15380
15628
  title: "\u89C4\u683C\u56FE\u7247",
15381
15629
  align: 'center',
15382
15630
  ellipsis: true,
@@ -15392,162 +15640,78 @@ var jkyColumns = [{
15392
15640
  });
15393
15641
  }
15394
15642
  }, {
15395
- dataIndex: 'sellCount',
15396
- title: "\u6570\u91CF",
15397
- width: 100,
15398
- render: function render(val) {
15399
- return /*#__PURE__*/React__default['default'].createElement("span", null, val);
15400
- }
15401
- }, {
15402
- dataIndex: 'actualSendCount',
15403
- title: "\u5B9E\u53D1\u6570\u91CF",
15643
+ dataIndex: 'colorName',
15644
+ title: "\u989C\u8272\u540D\u79F0",
15645
+ align: 'center',
15646
+ ellipsis: true,
15404
15647
  width: 150,
15405
15648
  render: renderTextEllipsis
15406
15649
  }, {
15407
- dataIndex: 'sellPrice',
15408
- title: "\u5355\u4EF7",
15409
- width: 150,
15410
- render: function render(val) {
15411
- return val || val === 0 ? Number(val).toFixed(2) : '';
15412
- }
15413
- }, {
15414
- dataIndex: 'sellTotal',
15415
- title: "\u91D1\u989D",
15416
- width: 150
15417
- }, {
15418
- dataIndex: 'discountTotal',
15419
- title: "\u62B5\u6263\u91D1\u989D",
15420
- width: 150
15421
- }, {
15422
- dataIndex: 'shareFavourableFee',
15423
- title: "\u5206\u644A\u91D1\u989D",
15424
- width: 150
15425
- }, {
15426
- dataIndex: 'shareFavourableAfterFee',
15427
- title: "\u5206\u644A\u540E\u91D1\u989D",
15428
- width: 150
15429
- }, {
15430
- dataIndex: 'customerPrice',
15431
- title: "\u7EC8\u7AEF\u9500\u552E\u5355\u4EF7",
15432
- width: 150
15433
- }, {
15434
- dataIndex: 'customerTotal',
15435
- title: "\u7EC8\u7AEF\u9500\u552E\u91D1\u989D",
15436
- width: 150
15437
- }, {
15438
- dataIndex: 'divideSellTotal',
15439
- title: "\u5B9E\u4ED8\u91D1\u989D",
15440
- width: 150
15441
- }, {
15442
- dataIndex: 'isGift',
15443
- title: "\u662F\u5426\u8D60\u54C1",
15444
- width: 150,
15445
- render: function render(val) {
15446
- return /*#__PURE__*/React__default['default'].createElement("span", null, val === '1' ? '是' : '否');
15447
- }
15448
- }, {
15449
- dataIndex: 'isFit',
15450
- title: "\u662F\u5426\u7EC4\u5408\u88C5",
15451
- width: 150,
15452
- render: function render(val) {
15453
- return /*#__PURE__*/React__default['default'].createElement("span", null, val === '1' ? '是' : '否');
15454
- }
15455
- }, {
15456
- dataIndex: 'isPresell',
15457
- title: "\u662F\u5426\u9884\u552E\u8D27\u54C1",
15458
- width: 150,
15459
- render: function render(val) {
15460
- return /*#__PURE__*/React__default['default'].createElement("span", null, val === '1' ? '是' : '否');
15461
- }
15462
- }, {
15463
- dataIndex: 'brandName',
15464
- title: "\u54C1\u724C",
15650
+ dataIndex: 'colorCode',
15651
+ title: "\u989C\u8272\u4EE3\u7801",
15465
15652
  align: 'center',
15466
15653
  ellipsis: true,
15467
- width: 200,
15654
+ width: 150,
15468
15655
  render: renderTextEllipsis
15469
15656
  }, {
15470
- dataIndex: 'cateName',
15471
- title: "\u8D27\u54C1\u7C7B\u522B",
15657
+ dataIndex: 'sizeName',
15658
+ title: "\u5C3A\u7801\u540D\u79F0",
15472
15659
  align: 'center',
15473
15660
  ellipsis: true,
15474
15661
  width: 150,
15475
15662
  render: renderTextEllipsis
15476
15663
  }, {
15477
- dataIndex: 'goodsTags',
15478
- title: "\u8D27\u54C1\u6807\u7B7E",
15664
+ dataIndex: 'sizeCode',
15665
+ title: "\u5C3A\u7801\u4EE3\u7801",
15479
15666
  align: 'center',
15480
15667
  ellipsis: true,
15481
- width: 250,
15668
+ width: 150,
15482
15669
  render: renderTextEllipsis
15483
15670
  }, {
15484
- dataIndex: 'goodsMemo',
15485
- title: "\u8D27\u54C1\u5907\u6CE8",
15671
+ dataIndex: 'marketPrice',
15672
+ title: "\u5E02\u573A\u4EF7",
15486
15673
  align: 'center',
15487
15674
  ellipsis: true,
15488
- width: 250,
15675
+ width: 150,
15489
15676
  render: renderTextEllipsis
15490
15677
  }, {
15491
- dataIndex: 'tradeGoodsNo',
15492
- title: "\u4EA4\u6613\u8D27\u54C1\u7F16\u53F7",
15678
+ dataIndex: 'retailPrice',
15679
+ title: "\u96F6\u552E\u4EF7",
15493
15680
  align: 'center',
15494
15681
  ellipsis: true,
15495
- width: 250,
15682
+ width: 150,
15496
15683
  render: renderTextEllipsis
15497
15684
  }, {
15498
- dataIndex: 'tradeGoodsName',
15499
- title: "\u4EA4\u6613\u8D27\u54C1\u540D\u79F0",
15685
+ dataIndex: 'memberPrice',
15686
+ title: "\u4F1A\u5458\u4EF7",
15687
+ align: 'center',
15500
15688
  ellipsis: true,
15501
- width: 250,
15689
+ width: 150,
15502
15690
  render: renderTextEllipsis
15503
15691
  }, {
15504
- dataIndex: 'tradeGoodsSpec',
15505
- title: "\u4EA4\u6613\u89C4\u683C\u540D\u79F0",
15692
+ dataIndex: 'costPrice',
15693
+ title: "\u6210\u672C\u4EF7",
15694
+ align: 'center',
15506
15695
  ellipsis: true,
15507
- width: 250,
15696
+ width: 150,
15508
15697
  render: renderTextEllipsis
15509
15698
  }, {
15510
- dataIndex: 'sourceSubtradeNo',
15511
- title: "\u7F51\u5E97\u5B50\u8BA2\u5355\u53F7",
15699
+ dataIndex: 'isVirtual',
15700
+ title: "\u662F\u5426\u865A\u62DF\u5546\u54C1",
15701
+ align: 'center',
15512
15702
  ellipsis: true,
15513
- width: 250,
15514
- render: renderTextEllipsis
15703
+ width: 150,
15704
+ render: function render(val) {
15705
+ return renderTextEllipsis(getYesOrNo$2(val));
15706
+ }
15515
15707
  }, {
15516
- dataIndex: 'platGoodsId',
15517
- title: "\u5E73\u53F0\u5546\u54C1ID",
15518
- ellipsis: true,
15519
- width: 250,
15520
- render: renderTextEllipsis
15521
- }, {
15522
- dataIndex: 'subTradeId',
15523
- title: "\u5546\u54C1\u660E\u7EC6ID",
15524
- ellipsis: true,
15525
- width: 250,
15526
- render: renderTextEllipsis
15527
- }, {
15528
- dataIndex: 'batchNo',
15529
- title: "\u6279\u6B21\u53F7",
15530
- ellipsis: true,
15531
- width: 250,
15532
- render: renderTextEllipsis
15533
- }, {
15534
- dataIndex: 'sendCount',
15535
- title: "\u6279\u6B21\u6570\u91CF",
15536
- ellipsis: true,
15537
- width: 250,
15538
- render: renderTextEllipsis
15539
- }, {
15540
- dataIndex: 'productDate',
15541
- title: "\u751F\u4EA7\u65E5\u671F",
15542
- ellipsis: true,
15543
- width: 250,
15544
- render: renderTextEllipsis
15545
- }, {
15546
- dataIndex: 'expireDate',
15547
- title: "\u5230\u671F\u65E5\u671F",
15708
+ dataIndex: 'skuType',
15709
+ title: "\u662F\u5426\u7EC4\u5408\u88C5",
15548
15710
  ellipsis: true,
15549
- width: 250,
15550
- render: renderTextEllipsis
15711
+ width: 150,
15712
+ render: function render(val) {
15713
+ return renderTextEllipsis(getYesOrNo$2(val === 'combine'));
15714
+ }
15551
15715
  }];
15552
15716
 
15553
15717
  var getColumnsMap = function getColumnsMap() {
@@ -15821,14 +15985,7 @@ var transformFormData = function transformFormData(formData) {
15821
15985
  if (formData[key]) {
15822
15986
  var _formData$key, _formData$key2, _formData$key3, _formData$key4;
15823
15987
  var value = ((_formData$key = formData[key]) === null || _formData$key === void 0 ? void 0 : _formData$key.type) ? (_formData$key2 = formData[key]) === null || _formData$key2 === void 0 ? void 0 : _formData$key2.inputValue : formData[key];
15824
- // 如果 value 是字符串且包含中英文逗号或空格,则拆分成数组
15825
- if (typeof value === 'string' && (value.includes(',') || value.includes("\uFF0C") || value.includes(' '))) {
15826
- var _value, _value$replace, _value$replace$split;
15827
- value = (_value = value) === null || _value === void 0 ? void 0 : (_value$replace = _value.replace(/[,, ]/g, ',')) === null || _value$replace === void 0 ? void 0 : (_value$replace$split = _value$replace.split(',')) === null || _value$replace$split === void 0 ? void 0 : _value$replace$split.filter(function (v) {
15828
- return v;
15829
- });
15830
- }
15831
- var compareSymbol = ((_formData$key3 = formData[key]) === null || _formData$key3 === void 0 ? void 0 : _formData$key3.type) ? (_formData$key4 = formData[key]) === null || _formData$key4 === void 0 ? void 0 : _formData$key4.type : Array.isArray(value) ? 'include' : 'eq';
15988
+ var compareSymbol = ((_formData$key3 = formData[key]) === null || _formData$key3 === void 0 ? void 0 : _formData$key3.type) ? (_formData$key4 = formData[key]) === null || _formData$key4 === void 0 ? void 0 : _formData$key4.type : Array.isArray(value) ? 'eq' : 'like';
15832
15989
  conditionList.push({
15833
15990
  leftValue: key,
15834
15991
  compareSymbol: compareSymbol,
@@ -15974,6 +16131,24 @@ var GoodList = function GoodList(props, ref) {
15974
16131
  };
15975
16132
  })
15976
16133
  }
16134
+ }, {
16135
+ label: '是否组合装',
16136
+ name: 'skuType',
16137
+ dataIndex: 'skuType',
16138
+ type: 'select',
16139
+ formItemProps: {
16140
+ mode: 'multiple',
16141
+ filterOption: function filterOption(input, option) {
16142
+ return option.label.includes(input);
16143
+ },
16144
+ options: [{
16145
+ label: '组合装',
16146
+ value: 'suite'
16147
+ }, {
16148
+ label: '非组合装',
16149
+ value: ''
16150
+ }]
16151
+ }
15977
16152
  }];
15978
16153
  var rowSelection = {
15979
16154
  selectedRowKeys: selectIds,
@@ -18797,13 +18972,15 @@ var JyGoodsModal$1 = /*#__PURE__*/React.forwardRef(JyGoodsModal);
18797
18972
  var getTableData$6 = function getTableData(_ref, formData) {
18798
18973
  var current = _ref.current,
18799
18974
  pageSize = _ref.pageSize;
18975
+ var conditionList = transformFormData(formData);
18800
18976
  return extendRequest('/qy/gdfw/product/product/page', {
18801
18977
  method: 'post',
18802
- data: _objectSpread2({
18978
+ data: {
18803
18979
  pageSize: pageSize,
18804
18980
  pageNo: current,
18805
- platform: 'JY_ERP'
18806
- }, formData)
18981
+ platform: 'JKY_ERP',
18982
+ conditionList: conditionList
18983
+ }
18807
18984
  }).then(function (res) {
18808
18985
  var _res$data = res.data,
18809
18986
  _res$data$productSkuL = _res$data.productSkuList,
@@ -18826,13 +19003,15 @@ var searchFormData$5 = [{
18826
19003
  }, {
18827
19004
  label: '规格编码',
18828
19005
  name: 'skuCode',
18829
- dataIndex: 'specNo'
19006
+ dataIndex: 'specNo',
19007
+ type: 'optionalInput'
18830
19008
  }, {
18831
- label: '商品名称',
19009
+ label: '货品名称',
18832
19010
  name: 'goodName'
18833
19011
  }, {
18834
- label: '商品编码',
18835
- name: 'goodNo'
19012
+ label: '货品编码',
19013
+ name: 'goodNo',
19014
+ type: 'optionalInput'
18836
19015
  }];
18837
19016
  var GoodList$6 = function GoodList(props, ref) {
18838
19017
  var _useState = React.useState([]),
@@ -18902,8 +19081,8 @@ var GoodList$6 = function GoodList(props, ref) {
18902
19081
  getCheckboxProps: function getCheckboxProps(record) {
18903
19082
  var options = {
18904
19083
  disabled: (props.selectedRows || []).map(function (row) {
18905
- return row.id || row.specId;
18906
- }).includes(record.id || record.specId),
19084
+ return row.specId || record.id;
19085
+ }).includes(record.specId || record.id),
18907
19086
  name: record.id
18908
19087
  };
18909
19088
  return options;
@@ -20350,7 +20529,7 @@ var getColumns$2 = function getColumns(_ref) {
20350
20529
  };
20351
20530
  };
20352
20531
 
20353
- var getYesOrNo$2 = function getYesOrNo(val) {
20532
+ var getYesOrNo$3 = function getYesOrNo(val) {
20354
20533
  if (kmkfUtils.isNull(val)) return null;
20355
20534
  return val ? '是' : '否';
20356
20535
  };
@@ -20501,7 +20680,7 @@ var getColumns$3 = function getColumns(_ref) {
20501
20680
  label: '否',
20502
20681
  value: false
20503
20682
  }]
20504
- }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$2(val));
20683
+ }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$3(val));
20505
20684
  },
20506
20685
  width: 100
20507
20686
  }]
@@ -20513,7 +20692,7 @@ var isNumberOrNumberString$1 = function isNumberOrNumberString(value) {
20513
20692
  if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
20514
20693
  return false;
20515
20694
  };
20516
- var getYesOrNo$3 = function getYesOrNo(val) {
20695
+ var getYesOrNo$4 = function getYesOrNo(val) {
20517
20696
  if (kmkfUtils.isNull(val)) return null;
20518
20697
  return val ? '是' : '否';
20519
20698
  };
@@ -20628,7 +20807,7 @@ var getColumns$4 = function getColumns(_ref) {
20628
20807
  title: "\u662F\u5426\u53D6\u6D88",
20629
20808
  width: 150,
20630
20809
  render: function render(val) {
20631
- return /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$3(val));
20810
+ return /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$4(val));
20632
20811
  }
20633
20812
  }, {
20634
20813
  dataIndex: 'isGift',
@@ -20647,7 +20826,7 @@ var getColumns$4 = function getColumns(_ref) {
20647
20826
  label: '否',
20648
20827
  value: 0
20649
20828
  }]
20650
- }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$3(val));
20829
+ }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$4(val));
20651
20830
  }
20652
20831
  }, {
20653
20832
  dataIndex: 'skuNote',
@@ -20773,7 +20952,7 @@ var getColumns$4 = function getColumns(_ref) {
20773
20952
  label: '否',
20774
20953
  value: 0
20775
20954
  }]
20776
- }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$3(val));
20955
+ }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$4(val));
20777
20956
  }
20778
20957
  }].map(function (item) {
20779
20958
  return _objectSpread2(_objectSpread2({}, item), {}, {
@@ -20902,7 +21081,7 @@ var getColumns$4 = function getColumns(_ref) {
20902
21081
  label: '否',
20903
21082
  value: 0
20904
21083
  }]
20905
- }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$3(val));
21084
+ }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$4(val));
20906
21085
  }
20907
21086
  }].map(function (item) {
20908
21087
  return _objectSpread2(_objectSpread2({}, item), {}, {
@@ -21641,16 +21820,28 @@ function toNum$3(value) {
21641
21820
  }
21642
21821
  return void 0;
21643
21822
  }
21644
- var getColumns$6 = function getColumns(_ref) {
21645
- var _ref$text = _ref.text,
21823
+ var isNumberOrNumberString$2 = function isNumberOrNumberString(value) {
21824
+ if (typeof value === 'number') return true;
21825
+ if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
21826
+ return false;
21827
+ };
21828
+ var getColumns$6 = function getColumns() {
21829
+ var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
21830
+ _ref$text = _ref.text,
21646
21831
  disabled = _ref.disabled,
21647
- updateHandle = _ref.updateHandle;
21832
+ updateHandle = _ref.updateHandle,
21833
+ updateDataHandle = _ref.updateDataHandle;
21648
21834
  return {
21649
21835
  KM_GOODS: [{
21650
21836
  dataIndex: 'skuPropertiesName',
21651
21837
  title: "\u89C4\u683C\u540D\u79F0",
21652
21838
  width: 250,
21653
21839
  render: renderTextEllipsis
21840
+ }, {
21841
+ dataIndex: 'sysSkuPropertiesName',
21842
+ title: "\u7CFB\u7EDF\u89C4\u683C\u540D\u79F0",
21843
+ width: 150,
21844
+ render: renderTextEllipsis
21654
21845
  }, {
21655
21846
  dataIndex: 'sysTitle',
21656
21847
  title: "\u7CFB\u7EDF\u5546\u54C1\u540D\u79F0",
@@ -21758,6 +21949,11 @@ var getColumns$6 = function getColumns(_ref) {
21758
21949
  title: "\u4F9B\u5E94\u5546\u7F16\u7801",
21759
21950
  width: 150,
21760
21951
  render: renderTextEllipsis
21952
+ }, {
21953
+ dataIndex: 'remark',
21954
+ title: "\u5907\u6CE8",
21955
+ width: 200,
21956
+ render: renderTextEllipsis
21761
21957
  }].map(function (item) {
21762
21958
  return _objectSpread2(_objectSpread2({}, item), {}, {
21763
21959
  align: 'center',
@@ -21769,6 +21965,11 @@ var getColumns$6 = function getColumns(_ref) {
21769
21965
  title: "\u89C4\u683C\u540D\u79F0",
21770
21966
  width: 250,
21771
21967
  render: renderTextEllipsis
21968
+ }, {
21969
+ dataIndex: 'sysSkuPropertiesName',
21970
+ title: "\u7CFB\u7EDF\u89C4\u683C\u540D\u79F0",
21971
+ width: 150,
21972
+ render: renderTextEllipsis
21772
21973
  }, {
21773
21974
  dataIndex: 'sysTitle',
21774
21975
  title: "\u7CFB\u7EDF\u5546\u54C1\u540D\u79F0",
@@ -21813,7 +22014,9 @@ var getColumns$6 = function getColumns(_ref) {
21813
22014
  dataIndex: 'realNum',
21814
22015
  title: "\u5B9E\u9645\u8865\u53D1\u6570\u91CF",
21815
22016
  width: 100,
21816
- validator: function validator(_rule, value) {
22017
+ validator: function validator(_rule, value, extraParams) {
22018
+ console.log('实际补发数量-extraParams', extraParams);
22019
+ if (!(extraParams === null || extraParams === void 0 ? void 0 : extraParams.quantityVerify)) return undefined;
21817
22020
  var title = '';
21818
22021
  if (((value === null || value === void 0 ? void 0 : value.kmReissueGoods) || []).some(function (goods) {
21819
22022
  var realNum = toNum$3(goods === null || goods === void 0 ? void 0 : goods.realNum);
@@ -21841,8 +22044,21 @@ var getColumns$6 = function getColumns(_ref) {
21841
22044
  }
21842
22045
  }, {
21843
22046
  dataIndex: 'desiredNum',
21844
- title: "\u5E94\u8865\u53D1\u6570\u91CF",
22047
+ title: "\u7533\u8BF7\u8865\u53D1\u6570\u91CF",
21845
22048
  width: 100,
22049
+ validator: function validator(_rule, value) {
22050
+ var title = '';
22051
+ if (((value === null || value === void 0 ? void 0 : value.kmReissueGoods) || []).some(function (goods) {
22052
+ var desiredNum = toNum$3(goods === null || goods === void 0 ? void 0 : goods.desiredNum);
22053
+ var res = typeof desiredNum === 'number' ? desiredNum < 1 : true;
22054
+ if (res) {
22055
+ title = (goods === null || goods === void 0 ? void 0 : goods.goodName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.goodName, "]") : '';
22056
+ }
22057
+ return res;
22058
+ })) {
22059
+ return Promise.reject("".concat(title, "\u7533\u8BF7\u8865\u53D1\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
22060
+ }
22061
+ },
21846
22062
  render: function render(val, record, index) {
21847
22063
  return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
21848
22064
  style: {
@@ -21911,136 +22127,60 @@ var getColumns$6 = function getColumns(_ref) {
21911
22127
  align: 'center',
21912
22128
  ellipsis: true
21913
22129
  });
21914
- })
21915
- };
21916
- };
21917
-
21918
- var isNumberOrNumberString$2 = function isNumberOrNumberString(value) {
21919
- if (typeof value === 'number') return true;
21920
- if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
21921
- return false;
21922
- };
21923
- function toNum$4(value) {
21924
- if (typeof value === 'string') {
21925
- return value ? +value : void 0;
21926
- }
21927
- if (typeof value === 'number') {
21928
- return value;
21929
- }
21930
- return void 0;
21931
- }
21932
- var getColumns$7 = function getColumns(_ref) {
21933
- var _ref$text = _ref.text,
21934
- disabled = _ref.disabled,
21935
- updateHandle = _ref.updateHandle,
21936
- updateDataHandle = _ref.updateDataHandle;
21937
- return {
21938
- //巨益商品信息
21939
- JY_GOODS: [{
21940
- dataIndex: 'productName',
21941
- title: "\u7CFB\u7EDF\u5546\u54C1\u540D\u79F0",
21942
- align: 'center',
21943
- ellipsis: true,
21944
- width: 150,
21945
- render: renderTextEllipsis
21946
- }, {
21947
- dataIndex: 'productCode',
21948
- title: "\u7CFB\u7EDF\u5546\u54C1\u7F16\u7801",
21949
- align: 'center',
21950
- ellipsis: true,
21951
- width: 150,
21952
- render: renderTextEllipsis
21953
- }, {
21954
- dataIndex: 'productId',
21955
- title: "\u7CFB\u7EDF\u5546\u54C1ID",
21956
- align: 'center',
21957
- ellipsis: true,
21958
- width: 150,
22130
+ }),
22131
+ KM_RETURN_GOODS: [{
22132
+ dataIndex: 'skuPropertiesName',
22133
+ title: "\u89C4\u683C\u540D\u79F0",
22134
+ width: 250,
21959
22135
  render: renderTextEllipsis
21960
22136
  }, {
21961
- dataIndex: 'skuName',
22137
+ dataIndex: 'sysSkuPropertiesName',
21962
22138
  title: "\u7CFB\u7EDF\u89C4\u683C\u540D\u79F0",
21963
- align: 'center',
21964
- ellipsis: true,
21965
22139
  width: 150,
21966
22140
  render: renderTextEllipsis
21967
22141
  }, {
21968
- dataIndex: 'skuCode',
21969
- title: "\u7CFB\u7EDF\u89C4\u683C\u7F16\u7801",
21970
- align: 'center',
21971
- ellipsis: true,
22142
+ dataIndex: 'sysTitle',
22143
+ title: "\u7CFB\u7EDF\u5546\u54C1\u540D\u79F0",
21972
22144
  width: 150,
21973
22145
  render: renderTextEllipsis
21974
22146
  }, {
21975
- dataIndex: 'specId',
21976
- title: "\u89C4\u683CID",
21977
- align: 'center',
21978
- ellipsis: true,
22147
+ dataIndex: 'shortTitle',
22148
+ title: "\u5546\u54C1\u7B80\u79F0",
21979
22149
  width: 150,
21980
22150
  render: renderTextEllipsis
21981
22151
  }, {
21982
- dataIndex: 'goodsClass',
21983
- title: "\u8D27\u54C1\u7C7B\u522B",
22152
+ dataIndex: 'title',
22153
+ title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
21984
22154
  width: 150,
21985
22155
  render: renderTextEllipsis
21986
22156
  }, {
21987
- dataIndex: 'code',
21988
- title: "\u6761\u7801",
22157
+ dataIndex: 'sysOuterId',
22158
+ title: "\u7CFB\u7EDF\u5546\u5BB6\u7F16\u7801",
21989
22159
  width: 150,
21990
22160
  render: renderTextEllipsis
21991
- },
21992
- // {
21993
- // dataIndex: 'specName',
21994
- // title: `规格名称`,
21995
- // align: 'center',
21996
- // ellipsis: true,
21997
- // width: 200,
21998
- // },
21999
- // {
22000
- // dataIndex: 'specCode',
22001
- // title: `规格编号`,
22002
- // align: 'center',
22003
- // ellipsis: true,
22004
- // width: 150,
22005
- // },
22006
- {
22007
- dataIndex: 'mallProductName',
22008
- title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
22009
- align: 'center',
22010
- ellipsis: true,
22011
- width: 250,
22012
- render: renderTextEllipsis
22013
22161
  }, {
22014
- dataIndex: 'mallProductOutCode',
22015
- title: "\u5E73\u53F0\u5546\u54C1\u7F16\u7801",
22016
- align: 'center',
22017
- ellipsis: true,
22162
+ dataIndex: 'itemSysId',
22163
+ title: "\u7CFB\u7EDF\u5546\u54C1ID",
22018
22164
  width: 150,
22019
22165
  render: renderTextEllipsis
22020
22166
  }, {
22021
- dataIndex: 'mallProductId',
22022
- title: "\u5E73\u53F0\u5546\u54C1ID",
22023
- align: 'center',
22024
- ellipsis: true,
22025
- width: 250,
22167
+ dataIndex: 'skuSysId',
22168
+ title: "\u7CFB\u7EDF\u89C4\u683CID",
22169
+ width: 150,
22026
22170
  render: renderTextEllipsis
22027
22171
  }, {
22028
- dataIndex: 'mallSkuName',
22029
- title: "\u5E73\u53F0\u89C4\u683C\u540D\u79F0",
22030
- align: 'center',
22031
- ellipsis: true,
22032
- width: 250,
22172
+ dataIndex: 'skuId',
22173
+ title: "\u5E73\u53F0\u89C4\u683CID",
22174
+ width: 170,
22033
22175
  render: renderTextEllipsis
22034
22176
  }, {
22035
- dataIndex: 'mallSkuId',
22036
- title: "\u5E73\u53F0\u89C4\u683CID",
22037
- align: 'center',
22038
- ellipsis: true,
22039
- width: 250,
22177
+ dataIndex: 'outerSkuId',
22178
+ title: "\u5E73\u53F0\u89C4\u683C\u7F16\u7801",
22179
+ width: 170,
22040
22180
  render: renderTextEllipsis
22041
22181
  }, {
22042
- dataIndex: 'sellCount',
22043
- title: "\u6570\u91CF",
22182
+ dataIndex: 'realNum',
22183
+ title: "\u5B9E\u9645\u9000\u8D27\u6570\u91CF",
22044
22184
  width: 100,
22045
22185
  render: function render(val, record, index) {
22046
22186
  return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
@@ -22052,45 +22192,446 @@ var getColumns$7 = function getColumns(_ref) {
22052
22192
  precision: 0,
22053
22193
  onChange: function onChange(num) {
22054
22194
  updateDataHandle({
22055
- sellCount: num,
22056
- sellTotal: num && isNumberOrNumberString$2(record.sellPrice) ? num * record.sellPrice : null
22195
+ realNum: num,
22196
+ refundMoney: num && isNumberOrNumberString$2(record.price) ? num * record.price : null
22057
22197
  }, index);
22058
22198
  }
22059
22199
  }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
22060
22200
  }
22061
22201
  }, {
22062
- dataIndex: 'sellPrice',
22063
- title: "\u5355\u4EF7",
22064
- width: 150,
22202
+ dataIndex: 'desiredNum',
22203
+ title: "\u7533\u8BF7\u9000\u8D27\u6570\u91CF",
22204
+ width: 100,
22205
+ validator: function validator(_rule, value) {
22206
+ var title = '';
22207
+ if (((value === null || value === void 0 ? void 0 : value.kmReturnGoods) || []).some(function (goods) {
22208
+ var desiredNum = toNum$3(goods === null || goods === void 0 ? void 0 : goods.desiredNum);
22209
+ var res = typeof desiredNum === 'number' ? desiredNum < 1 : true;
22210
+ if (res) {
22211
+ title = (goods === null || goods === void 0 ? void 0 : goods.goodName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.goodName, "]") : '';
22212
+ }
22213
+ return res;
22214
+ })) {
22215
+ return Promise.reject("".concat(title, "\u7533\u8BF7\u9000\u8D27\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
22216
+ }
22217
+ },
22065
22218
  render: function render(val, record, index) {
22066
22219
  return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
22067
22220
  style: {
22068
- width: 130
22221
+ width: 70
22069
22222
  },
22070
22223
  value: val,
22071
- min: 0,
22072
- precision: 2,
22224
+ min: 1,
22225
+ precision: 0,
22073
22226
  onChange: function onChange(num) {
22074
- updateDataHandle({
22075
- sellPrice: num,
22076
- sellTotal: num && isNumberOrNumberString$2(record.sellCount) ? num * record.sellCount : null
22077
- }, index);
22227
+ return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'desiredNum');
22078
22228
  }
22079
22229
  }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
22080
22230
  }
22081
22231
  }, {
22082
- dataIndex: 'mallSellingPrice',
22083
- title: "\u5E73\u53F0\u5546\u54C1\u4EF7\u683C",
22084
- width: 150
22085
- }, {
22086
- dataIndex: 'sellTotal',
22087
- title: "\u91D1\u989D",
22088
- width: 150
22089
- }, {
22090
- dataIndex: 'settlementPrice',
22091
- title: "\u7ED3\u7B97\u4EF7",
22092
- width: 150
22093
- }, {
22232
+ dataIndex: 'goodNum',
22233
+ title: "\u826F\u54C1\u6570",
22234
+ width: 100,
22235
+ render: function render(val, record, index) {
22236
+ return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
22237
+ style: {
22238
+ width: 70
22239
+ },
22240
+ value: val,
22241
+ min: 1,
22242
+ precision: 0,
22243
+ onChange: function onChange(num) {
22244
+ return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'goodNum');
22245
+ }
22246
+ }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
22247
+ }
22248
+ }, {
22249
+ dataIndex: 'defectiveNum',
22250
+ title: "\u6B21\u54C1\u6570",
22251
+ width: 100,
22252
+ render: function render(val, record, index) {
22253
+ return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
22254
+ style: {
22255
+ width: 70
22256
+ },
22257
+ value: val,
22258
+ min: 1,
22259
+ precision: 0,
22260
+ onChange: function onChange(num) {
22261
+ return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'defectiveNum');
22262
+ }
22263
+ }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
22264
+ }
22265
+ }, {
22266
+ dataIndex: 'price',
22267
+ title: "\u5546\u54C1\u9500\u552E\u4EF7",
22268
+ width: 150,
22269
+ render: function render(val) {
22270
+ return val || val === 0 ? Number(val).toFixed(2) : '';
22271
+ }
22272
+ }, {
22273
+ dataIndex: 'refundMoney',
22274
+ title: "\u5B9E\u9000\u91D1\u989D",
22275
+ width: 150,
22276
+ render: function render(val, record, index) {
22277
+ return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
22278
+ style: {
22279
+ width: 130
22280
+ },
22281
+ value: val,
22282
+ min: 0,
22283
+ precision: 2,
22284
+ onChange: function onChange(num) {
22285
+ return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'refundMoney');
22286
+ }
22287
+ }) : /*#__PURE__*/React__default['default'].createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
22288
+ }
22289
+ }, {
22290
+ dataIndex: 'type',
22291
+ title: "\u5546\u54C1\u7C7B\u578B",
22292
+ width: 150,
22293
+ render: renderTextEllipsis
22294
+ }, {
22295
+ dataIndex: 'sysPicPath',
22296
+ title: "\u5546\u54C1\u56FE\u7247",
22297
+ width: 100,
22298
+ headerComponentType: 'pic',
22299
+ render: function render(val) {
22300
+ var imgUrl = (val === null || val === void 0 ? void 0 : val.startsWith('http')) ? val : "https://erp.superboss.cc".concat(val);
22301
+ return /*#__PURE__*/React__default['default'].createElement(antd.Image, {
22302
+ width: 30,
22303
+ src: imgUrl
22304
+ });
22305
+ }
22306
+ }].map(function (item) {
22307
+ return _objectSpread2(_objectSpread2({}, item), {}, {
22308
+ align: 'center',
22309
+ ellipsis: true
22310
+ });
22311
+ }),
22312
+ KM_EXCHANGE_GOODS: [{
22313
+ dataIndex: 'skuPropertiesName',
22314
+ title: "\u89C4\u683C\u540D\u79F0",
22315
+ width: 250,
22316
+ render: renderTextEllipsis
22317
+ }, {
22318
+ dataIndex: 'sysSkuPropertiesName',
22319
+ title: "\u7CFB\u7EDF\u89C4\u683C\u540D\u79F0",
22320
+ width: 150,
22321
+ render: renderTextEllipsis
22322
+ }, {
22323
+ dataIndex: 'sysTitle',
22324
+ title: "\u7CFB\u7EDF\u5546\u54C1\u540D\u79F0",
22325
+ width: 150,
22326
+ render: renderTextEllipsis
22327
+ }, {
22328
+ dataIndex: 'shortTitle',
22329
+ title: "\u5546\u54C1\u7B80\u79F0",
22330
+ width: 150,
22331
+ render: renderTextEllipsis
22332
+ }, {
22333
+ dataIndex: 'title',
22334
+ title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
22335
+ width: 150,
22336
+ render: renderTextEllipsis
22337
+ }, {
22338
+ dataIndex: 'sysOuterId',
22339
+ title: "\u7CFB\u7EDF\u5546\u5BB6\u7F16\u7801",
22340
+ width: 150,
22341
+ render: renderTextEllipsis
22342
+ }, {
22343
+ dataIndex: 'itemSysId',
22344
+ title: "\u7CFB\u7EDF\u5546\u54C1ID",
22345
+ width: 150,
22346
+ render: renderTextEllipsis
22347
+ }, {
22348
+ dataIndex: 'skuSysId',
22349
+ title: "\u7CFB\u7EDF\u89C4\u683CID",
22350
+ width: 150,
22351
+ render: renderTextEllipsis
22352
+ }, {
22353
+ dataIndex: 'skuId',
22354
+ title: "\u5E73\u53F0\u89C4\u683CID",
22355
+ width: 170,
22356
+ render: renderTextEllipsis
22357
+ }, {
22358
+ dataIndex: 'outerSkuId',
22359
+ title: "\u5E73\u53F0\u89C4\u683C\u7F16\u7801",
22360
+ width: 170,
22361
+ render: renderTextEllipsis
22362
+ }, {
22363
+ dataIndex: 'realNum',
22364
+ title: "\u5B9E\u9645\u6362\u51FA\u6570\u91CF",
22365
+ width: 100,
22366
+ validator: function validator(_rule, value, extraParams) {
22367
+ if (!(extraParams === null || extraParams === void 0 ? void 0 : extraParams.quantityVerify)) return undefined;
22368
+ var title = '';
22369
+ if (((value === null || value === void 0 ? void 0 : value.kmExchangeGoods) || []).some(function (goods) {
22370
+ var realNum = toNum$3(goods === null || goods === void 0 ? void 0 : goods.realNum);
22371
+ var res = typeof realNum === 'number' ? realNum < 1 : true;
22372
+ if (res) {
22373
+ title = (goods === null || goods === void 0 ? void 0 : goods.goodName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.goodName, "]") : '';
22374
+ }
22375
+ return res;
22376
+ })) {
22377
+ return Promise.reject("".concat(title, "\u5B9E\u9645\u6362\u51FA\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
22378
+ }
22379
+ },
22380
+ render: function render(val, record, index) {
22381
+ return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
22382
+ style: {
22383
+ width: 70
22384
+ },
22385
+ value: val,
22386
+ min: 1,
22387
+ precision: 0,
22388
+ onChange: function onChange(num) {
22389
+ updateDataHandle({
22390
+ realNum: num,
22391
+ refundMoney: num && isNumberOrNumberString$2(record.price) ? num * record.price : null
22392
+ }, index);
22393
+ }
22394
+ }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
22395
+ }
22396
+ }, {
22397
+ dataIndex: 'desiredNum',
22398
+ title: "\u5E94\u6362\u51FA\u6570\u91CF",
22399
+ width: 100,
22400
+ validator: function validator(_rule, value) {
22401
+ var title = '';
22402
+ if (((value === null || value === void 0 ? void 0 : value.kmExchangeGoods) || []).some(function (goods) {
22403
+ var desiredNum = toNum$3(goods === null || goods === void 0 ? void 0 : goods.desiredNum);
22404
+ var res = typeof desiredNum === 'number' ? desiredNum < 1 : true;
22405
+ if (res) {
22406
+ title = (goods === null || goods === void 0 ? void 0 : goods.goodName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.goodName, "]") : '';
22407
+ }
22408
+ return res;
22409
+ })) {
22410
+ return Promise.reject("".concat(title, "\u5E94\u6362\u51FA\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
22411
+ }
22412
+ },
22413
+ render: function render(val, record, index) {
22414
+ return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
22415
+ style: {
22416
+ width: 70
22417
+ },
22418
+ value: val,
22419
+ min: 1,
22420
+ precision: 0,
22421
+ onChange: function onChange(num) {
22422
+ return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'desiredNum');
22423
+ }
22424
+ }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
22425
+ }
22426
+ }, {
22427
+ dataIndex: 'price',
22428
+ title: "\u5546\u54C1\u9500\u552E\u4EF7",
22429
+ width: 150,
22430
+ render: function render(val) {
22431
+ return val || val === 0 ? Number(val).toFixed(2) : '';
22432
+ }
22433
+ }, {
22434
+ dataIndex: 'type',
22435
+ title: "\u5546\u54C1\u7C7B\u578B",
22436
+ width: 150,
22437
+ render: renderTextEllipsis
22438
+ }, {
22439
+ dataIndex: 'sysPicPath',
22440
+ title: "\u5546\u54C1\u56FE\u7247",
22441
+ width: 100,
22442
+ headerComponentType: 'pic',
22443
+ render: function render(val) {
22444
+ var imgUrl = (val === null || val === void 0 ? void 0 : val.startsWith('http')) ? val : "https://erp.superboss.cc".concat(val);
22445
+ return /*#__PURE__*/React__default['default'].createElement(antd.Image, {
22446
+ width: 30,
22447
+ src: imgUrl
22448
+ });
22449
+ }
22450
+ }].map(function (item) {
22451
+ return _objectSpread2(_objectSpread2({}, item), {}, {
22452
+ align: 'center',
22453
+ ellipsis: true
22454
+ });
22455
+ })
22456
+ };
22457
+ };
22458
+
22459
+ var isNumberOrNumberString$3 = function isNumberOrNumberString(value) {
22460
+ if (typeof value === 'number') return true;
22461
+ if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
22462
+ return false;
22463
+ };
22464
+ function toNum$4(value) {
22465
+ if (typeof value === 'string') {
22466
+ return value ? +value : void 0;
22467
+ }
22468
+ if (typeof value === 'number') {
22469
+ return value;
22470
+ }
22471
+ return void 0;
22472
+ }
22473
+ var getColumns$7 = function getColumns(_ref) {
22474
+ var _ref$text = _ref.text,
22475
+ disabled = _ref.disabled,
22476
+ updateHandle = _ref.updateHandle,
22477
+ updateDataHandle = _ref.updateDataHandle;
22478
+ return {
22479
+ //巨益商品信息
22480
+ JY_GOODS: [{
22481
+ dataIndex: 'productName',
22482
+ title: "\u7CFB\u7EDF\u5546\u54C1\u540D\u79F0",
22483
+ align: 'center',
22484
+ ellipsis: true,
22485
+ width: 150,
22486
+ render: renderTextEllipsis
22487
+ }, {
22488
+ dataIndex: 'productCode',
22489
+ title: "\u7CFB\u7EDF\u5546\u54C1\u7F16\u7801",
22490
+ align: 'center',
22491
+ ellipsis: true,
22492
+ width: 150,
22493
+ render: renderTextEllipsis
22494
+ }, {
22495
+ dataIndex: 'productId',
22496
+ title: "\u7CFB\u7EDF\u5546\u54C1ID",
22497
+ align: 'center',
22498
+ ellipsis: true,
22499
+ width: 150,
22500
+ render: renderTextEllipsis
22501
+ }, {
22502
+ dataIndex: 'skuName',
22503
+ title: "\u7CFB\u7EDF\u89C4\u683C\u540D\u79F0",
22504
+ align: 'center',
22505
+ ellipsis: true,
22506
+ width: 150,
22507
+ render: renderTextEllipsis
22508
+ }, {
22509
+ dataIndex: 'skuCode',
22510
+ title: "\u7CFB\u7EDF\u89C4\u683C\u7F16\u7801",
22511
+ align: 'center',
22512
+ ellipsis: true,
22513
+ width: 150,
22514
+ render: renderTextEllipsis
22515
+ }, {
22516
+ dataIndex: 'specId',
22517
+ title: "\u89C4\u683CID",
22518
+ align: 'center',
22519
+ ellipsis: true,
22520
+ width: 150,
22521
+ render: renderTextEllipsis
22522
+ }, {
22523
+ dataIndex: 'goodsClass',
22524
+ title: "\u8D27\u54C1\u7C7B\u522B",
22525
+ width: 150,
22526
+ render: renderTextEllipsis
22527
+ }, {
22528
+ dataIndex: 'code',
22529
+ title: "\u6761\u7801",
22530
+ width: 150,
22531
+ render: renderTextEllipsis
22532
+ },
22533
+ // {
22534
+ // dataIndex: 'specName',
22535
+ // title: `规格名称`,
22536
+ // align: 'center',
22537
+ // ellipsis: true,
22538
+ // width: 200,
22539
+ // },
22540
+ // {
22541
+ // dataIndex: 'specCode',
22542
+ // title: `规格编号`,
22543
+ // align: 'center',
22544
+ // ellipsis: true,
22545
+ // width: 150,
22546
+ // },
22547
+ {
22548
+ dataIndex: 'mallProductName',
22549
+ title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
22550
+ align: 'center',
22551
+ ellipsis: true,
22552
+ width: 250,
22553
+ render: renderTextEllipsis
22554
+ }, {
22555
+ dataIndex: 'mallProductOutCode',
22556
+ title: "\u5E73\u53F0\u5546\u54C1\u7F16\u7801",
22557
+ align: 'center',
22558
+ ellipsis: true,
22559
+ width: 150,
22560
+ render: renderTextEllipsis
22561
+ }, {
22562
+ dataIndex: 'mallProductId',
22563
+ title: "\u5E73\u53F0\u5546\u54C1ID",
22564
+ align: 'center',
22565
+ ellipsis: true,
22566
+ width: 250,
22567
+ render: renderTextEllipsis
22568
+ }, {
22569
+ dataIndex: 'mallSkuName',
22570
+ title: "\u5E73\u53F0\u89C4\u683C\u540D\u79F0",
22571
+ align: 'center',
22572
+ ellipsis: true,
22573
+ width: 250,
22574
+ render: renderTextEllipsis
22575
+ }, {
22576
+ dataIndex: 'mallSkuId',
22577
+ title: "\u5E73\u53F0\u89C4\u683CID",
22578
+ align: 'center',
22579
+ ellipsis: true,
22580
+ width: 250,
22581
+ render: renderTextEllipsis
22582
+ }, {
22583
+ dataIndex: 'sellCount',
22584
+ title: "\u6570\u91CF",
22585
+ width: 100,
22586
+ render: function render(val, record, index) {
22587
+ return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
22588
+ style: {
22589
+ width: 70
22590
+ },
22591
+ value: val,
22592
+ min: 1,
22593
+ precision: 0,
22594
+ onChange: function onChange(num) {
22595
+ updateDataHandle({
22596
+ sellCount: num,
22597
+ sellTotal: num && isNumberOrNumberString$3(record.sellPrice) ? num * record.sellPrice : null
22598
+ }, index);
22599
+ }
22600
+ }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
22601
+ }
22602
+ }, {
22603
+ dataIndex: 'sellPrice',
22604
+ title: "\u5355\u4EF7",
22605
+ width: 150,
22606
+ render: function render(val, record, index) {
22607
+ return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
22608
+ style: {
22609
+ width: 130
22610
+ },
22611
+ value: val,
22612
+ min: 0,
22613
+ precision: 2,
22614
+ onChange: function onChange(num) {
22615
+ updateDataHandle({
22616
+ sellPrice: num,
22617
+ sellTotal: num && isNumberOrNumberString$3(record.sellCount) ? num * record.sellCount : null
22618
+ }, index);
22619
+ }
22620
+ }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
22621
+ }
22622
+ }, {
22623
+ dataIndex: 'mallSellingPrice',
22624
+ title: "\u5E73\u53F0\u5546\u54C1\u4EF7\u683C",
22625
+ width: 150
22626
+ }, {
22627
+ dataIndex: 'sellTotal',
22628
+ title: "\u91D1\u989D",
22629
+ width: 150
22630
+ }, {
22631
+ dataIndex: 'settlementPrice',
22632
+ title: "\u7ED3\u7B97\u4EF7",
22633
+ width: 150
22634
+ }, {
22094
22635
  dataIndex: 'divideOrderFee',
22095
22636
  title: "\u5206\u644A\u5B9E\u4ED8\u91D1\u989D",
22096
22637
  width: 150
@@ -22276,7 +22817,7 @@ var getColumns$7 = function getColumns(_ref) {
22276
22817
  onChange: function onChange(num) {
22277
22818
  updateDataHandle({
22278
22819
  sellCount: num,
22279
- sellTotal: num && isNumberOrNumberString$2(record.sellPrice) ? num * record.sellPrice : null
22820
+ sellTotal: num && isNumberOrNumberString$3(record.sellPrice) ? num * record.sellPrice : null
22280
22821
  }, index);
22281
22822
  }
22282
22823
  }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
@@ -22296,7 +22837,7 @@ var getColumns$7 = function getColumns(_ref) {
22296
22837
  onChange: function onChange(num) {
22297
22838
  updateDataHandle({
22298
22839
  sellPrice: num,
22299
- sellTotal: num && isNumberOrNumberString$2(record.sellCount) ? num * record.sellCount : null
22840
+ sellTotal: num && isNumberOrNumberString$3(record.sellCount) ? num * record.sellCount : null
22300
22841
  }, index);
22301
22842
  }
22302
22843
  }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
@@ -22420,7 +22961,7 @@ var getColumns$8 = function getColumns(_ref) {
22420
22961
  };
22421
22962
  };
22422
22963
 
22423
- var isNumberOrNumberString$3 = function isNumberOrNumberString(value) {
22964
+ var isNumberOrNumberString$4 = function isNumberOrNumberString(value) {
22424
22965
  if (typeof value === 'number') return true;
22425
22966
  if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
22426
22967
  return false;
@@ -22440,7 +22981,7 @@ var getColumns$9 = function getColumns(_ref) {
22440
22981
  updateHandle = _ref.updateHandle,
22441
22982
  updateDataHandle = _ref.updateDataHandle;
22442
22983
  return {
22443
- //巨益商品信息
22984
+ //吉客云商品信息
22444
22985
  JKY_GOODS: [{
22445
22986
  dataIndex: 'goodsNo',
22446
22987
  title: "\u8D27\u54C1\u7F16\u53F7",
@@ -22510,7 +23051,7 @@ var getColumns$9 = function getColumns(_ref) {
22510
23051
  onChange: function onChange(num) {
22511
23052
  updateDataHandle({
22512
23053
  sellCount: num,
22513
- sellTotal: num && isNumberOrNumberString$3(record.sellPrice) ? num * record.sellPrice : null
23054
+ sellTotal: num && isNumberOrNumberString$4(record.sellPrice) ? num * record.sellPrice : null
22514
23055
  }, index);
22515
23056
  }
22516
23057
  }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
@@ -22535,14 +23076,14 @@ var getColumns$9 = function getColumns(_ref) {
22535
23076
  onChange: function onChange(num) {
22536
23077
  updateDataHandle({
22537
23078
  sellPrice: num,
22538
- sellTotal: num && isNumberOrNumberString$3(record.sellCount) ? num * record.sellCount : null
23079
+ sellTotal: num && isNumberOrNumberString$4(record.sellCount) ? num * record.sellCount : null
22539
23080
  }, index);
22540
23081
  }
22541
23082
  }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
22542
23083
  }
22543
23084
  }, {
22544
23085
  dataIndex: 'sellTotal',
22545
- title: "\u91D1\u989D",
23086
+ title: "\u603B\u91D1\u989D",
22546
23087
  width: 150
22547
23088
  }, {
22548
23089
  dataIndex: 'discountTotal',
@@ -22567,7 +23108,22 @@ var getColumns$9 = function getColumns(_ref) {
22567
23108
  }, {
22568
23109
  dataIndex: 'divideSellTotal',
22569
23110
  title: "\u5B9E\u4ED8\u91D1\u989D",
22570
- width: 150
23111
+ width: 150,
23112
+ render: function render(val, record, index) {
23113
+ return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
23114
+ style: {
23115
+ width: 130
23116
+ },
23117
+ value: val,
23118
+ min: 0,
23119
+ precision: 2,
23120
+ onChange: function onChange(num) {
23121
+ updateDataHandle({
23122
+ divideSellTotal: num
23123
+ }, index);
23124
+ }
23125
+ }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
23126
+ }
22571
23127
  }, {
22572
23128
  dataIndex: 'isGift',
22573
23129
  title: "\u662F\u5426\u8D60\u54C1",
@@ -22586,12 +23142,12 @@ var getColumns$9 = function getColumns(_ref) {
22586
23142
  },
22587
23143
  options: [{
22588
23144
  label: '是',
22589
- value: '1'
23145
+ value: 1
22590
23146
  }, {
22591
23147
  label: '否',
22592
- value: '0'
23148
+ value: 0
22593
23149
  }]
22594
- }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === '1' ? '是' : '否');
23150
+ }) : /*#__PURE__*/React__default['default'].createElement("span", null, val == 1 ? '是' : '否');
22595
23151
  }
22596
23152
  }, {
22597
23153
  dataIndex: 'isFit',
@@ -22611,12 +23167,12 @@ var getColumns$9 = function getColumns(_ref) {
22611
23167
  },
22612
23168
  options: [{
22613
23169
  label: '是',
22614
- value: '1'
23170
+ value: 1
22615
23171
  }, {
22616
23172
  label: '否',
22617
- value: '0'
23173
+ value: 0
22618
23174
  }]
22619
- }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === '1' ? '是' : '否');
23175
+ }) : /*#__PURE__*/React__default['default'].createElement("span", null, val == 1 ? '是' : '否');
22620
23176
  }
22621
23177
  }, {
22622
23178
  dataIndex: 'isPresell',
@@ -22641,7 +23197,7 @@ var getColumns$9 = function getColumns(_ref) {
22641
23197
  label: '否',
22642
23198
  value: '0'
22643
23199
  }]
22644
- }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === '1' ? '是' : '否');
23200
+ }) : /*#__PURE__*/React__default['default'].createElement("span", null, val == '1' ? '是' : '否');
22645
23201
  }
22646
23202
  }, {
22647
23203
  dataIndex: 'brandName',
@@ -22738,7 +23294,7 @@ var getColumns$9 = function getColumns(_ref) {
22738
23294
  ellipsis: true
22739
23295
  });
22740
23296
  }),
22741
- // 巨益补发商品信息
23297
+ // 吉客云补发商品信息
22742
23298
  JKY_REISSUE_GOODS: [{
22743
23299
  dataIndex: 'goodsNo',
22744
23300
  title: "\u8D27\u54C1\u7F16\u53F7",
@@ -22809,7 +23365,7 @@ var getColumns$9 = function getColumns(_ref) {
22809
23365
  }
22810
23366
  },
22811
23367
  render: function render(val, record, index) {
22812
- return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
23368
+ return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
22813
23369
  style: {
22814
23370
  width: 70
22815
23371
  },
@@ -22819,7 +23375,7 @@ var getColumns$9 = function getColumns(_ref) {
22819
23375
  onChange: function onChange(num) {
22820
23376
  updateDataHandle({
22821
23377
  sellCount: num,
22822
- sellTotal: num && isNumberOrNumberString$3(record.sellPrice) ? num * record.sellPrice : null
23378
+ sellTotal: num && isNumberOrNumberString$4(record.sellPrice) ? num * record.sellPrice : null
22823
23379
  }, index);
22824
23380
  }
22825
23381
  }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
@@ -22829,7 +23385,7 @@ var getColumns$9 = function getColumns(_ref) {
22829
23385
  title: "\u5355\u4EF7",
22830
23386
  width: 150,
22831
23387
  render: function render(val, record, index) {
22832
- return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
23388
+ return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
22833
23389
  style: {
22834
23390
  width: 130
22835
23391
  },
@@ -22839,7 +23395,7 @@ var getColumns$9 = function getColumns(_ref) {
22839
23395
  onChange: function onChange(num) {
22840
23396
  updateDataHandle({
22841
23397
  sellPrice: num,
22842
- sellTotal: num && isNumberOrNumberString$3(record.sellCount) ? num * record.sellCount : null
23398
+ sellTotal: num && isNumberOrNumberString$4(record.sellCount) ? num * record.sellCount : null
22843
23399
  }, index);
22844
23400
  }
22845
23401
  }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
@@ -22849,56 +23405,59 @@ var getColumns$9 = function getColumns(_ref) {
22849
23405
  title: "\u603B\u91D1\u989D",
22850
23406
  width: 150,
22851
23407
  render: function render(val, record, index) {
22852
- return record.sellCount * record.sellPrice;
23408
+ if ((typeof record.sellCount === 'number' || record.sellCount) && (typeof record.sellPrice === 'number' || record.sellPrice)) {
23409
+ return record.sellCount * record.sellPrice;
23410
+ }
23411
+ return '';
22853
23412
  }
22854
23413
  }, {
22855
23414
  dataIndex: 'reason',
22856
23415
  title: "\u9000\u6362\u539F\u56E0",
22857
23416
  width: 250,
22858
23417
  render: function render(val, record, index) {
22859
- return /*#__PURE__*/React__default['default'].createElement(ApaasInput, {
22860
- onChange: function onChange(value) {
22861
- updateHandle(value, index, 'reason');
23418
+ return !disabled ? /*#__PURE__*/React__default['default'].createElement(ApaasInput, {
23419
+ onChange: function onChange(e) {
23420
+ updateHandle(e.target.value, index, 'reason');
22862
23421
  }
22863
- });
23422
+ }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
22864
23423
  }
22865
23424
  }, {
22866
23425
  dataIndex: 'isGift',
22867
23426
  title: "\u662F\u5426\u8D60\u54C1",
22868
23427
  width: 150,
22869
23428
  render: function render(val, record, index) {
22870
- return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
23429
+ return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
22871
23430
  value: val,
22872
23431
  onChange: function onChange(value) {
22873
23432
  updateHandle(value, index, 'isGift');
22874
23433
  },
22875
23434
  options: [{
22876
23435
  label: '是',
22877
- value: '1'
23436
+ value: 1
22878
23437
  }, {
22879
23438
  label: '否',
22880
- value: '0'
23439
+ value: 0
22881
23440
  }]
22882
- }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === '1' ? '是' : '否');
23441
+ }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === 1 ? '是' : '否');
22883
23442
  }
22884
23443
  }, {
22885
23444
  dataIndex: 'isFit',
22886
23445
  title: "\u662F\u5426\u7EC4\u5408\u88C5",
22887
23446
  width: 150,
22888
23447
  render: function render(val, record, index) {
22889
- return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
23448
+ return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
22890
23449
  value: val,
22891
23450
  onChange: function onChange(value) {
22892
23451
  updateHandle(value, index, 'isFit');
22893
23452
  },
22894
23453
  options: [{
22895
23454
  label: '是',
22896
- value: 'True'
23455
+ value: 1
22897
23456
  }, {
22898
23457
  label: '否',
22899
- value: 'False'
23458
+ value: 0
22900
23459
  }]
22901
- }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === 'True' ? '是' : '否');
23460
+ }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === 1 ? '是' : '否');
22902
23461
  }
22903
23462
  }, {
22904
23463
  dataIndex: 'brandName',
@@ -23064,7 +23623,8 @@ var getColumnsMap$1 = function getColumnsMap(args) {
23064
23623
  })), getColumns$6({
23065
23624
  text: text,
23066
23625
  disabled: disabled,
23067
- updateHandle: updateHandle
23626
+ updateHandle: updateHandle,
23627
+ updateDataHandle: updateDataHandle
23068
23628
  })), getColumns$7({
23069
23629
  text: text,
23070
23630
  disabled: disabled,
@@ -23088,7 +23648,7 @@ var getColumnsMap$1 = function getColumnsMap(args) {
23088
23648
  });
23089
23649
  };
23090
23650
  var erpColumnsMap = getColumnsMap$1();
23091
- var erpFormValidator = function erpFormValidator(_rule, value, type) {
23651
+ var erpFormValidator = function erpFormValidator(_rule, value, type, extraParams) {
23092
23652
  var validatorFnList = (erpColumnsMap[type] || erpColumnsMap['default']).map(function (column) {
23093
23653
  return column.validator;
23094
23654
  }).filter(Boolean);
@@ -23098,7 +23658,7 @@ var erpFormValidator = function erpFormValidator(_rule, value, type) {
23098
23658
  try {
23099
23659
  for (_iterator.s(); !(_step = _iterator.n()).done;) {
23100
23660
  var validatorFn = _step.value;
23101
- var validatorResult = validatorFn(_rule, value, type);
23661
+ var validatorResult = validatorFn(_rule, value, extraParams);
23102
23662
  if (validatorResult) {
23103
23663
  res = validatorResult;
23104
23664
  break;
@@ -23223,7 +23783,7 @@ var isErpType = {
23223
23783
  return ['JST_GOODS', 'JST_REISSUE_GOODS', 'JST_RETURN_GOODS', 'JST_EXCHANGE_GOODS'].includes(type);
23224
23784
  },
23225
23785
  isKm: function isKm(type) {
23226
- return ['KM_GOODS', 'KM_REISSUE_GOODS'].includes(type);
23786
+ return ['KM_GOODS', 'KM_REISSUE_GOODS', 'KM_RETURN_GOODS', 'KM_EXCHANGE_GOODS'].includes(type);
23227
23787
  },
23228
23788
  isJy: function isJy(type) {
23229
23789
  return ['JY_GOODS', 'JY_REISSUE_GOODS'].includes(type);
@@ -23282,6 +23842,13 @@ var processGoods$1 = function processGoods(_ref) {
23282
23842
  canUpdateNumber: canUpdateNumber,
23283
23843
  source: source
23284
23844
  });
23845
+ } else if (isErpType.isJky(type)) {
23846
+ newList = processJkyGoods$1({
23847
+ list: list,
23848
+ type: type,
23849
+ canUpdateNumber: canUpdateNumber,
23850
+ source: source
23851
+ });
23285
23852
  } else {
23286
23853
  newList = processDefaultGoods({
23287
23854
  list: list,
@@ -23330,11 +23897,45 @@ var processJyGoods = function processJyGoods(_ref2) {
23330
23897
  });
23331
23898
  });
23332
23899
  };
23333
- // 处理不同类型的商品数据
23334
- var processWdtGoods$1 = function processWdtGoods(_ref3) {
23900
+ var processJkyGoods$1 = function processJkyGoods(_ref3) {
23335
23901
  var list = _ref3.list,
23336
- type = _ref3.type,
23337
23902
  canUpdateNumber = _ref3.canUpdateNumber;
23903
+ return list.map(function (item) {
23904
+ var goodName = item.goodName,
23905
+ goodNo = item.goodNo,
23906
+ goodId = item.goodId,
23907
+ specBarcode = item.specBarcode,
23908
+ retailPrice = item.retailPrice,
23909
+ isGift = item.isGift,
23910
+ skuType = item.skuType,
23911
+ specImgUrl = item.specImgUrl,
23912
+ categoryName = item.categoryName;
23913
+ return _objectSpread2(_objectSpread2({}, item), {}, {
23914
+ cateName: categoryName,
23915
+ goodsName: goodName,
23916
+ goodsNo: goodNo,
23917
+ goodsId: goodId,
23918
+ barcode: specBarcode,
23919
+ skuImgUrl: specImgUrl,
23920
+ combinationName: goodName,
23921
+ combinationCode: goodNo,
23922
+ isGift: isGift ? 1 : 0,
23923
+ isFit: skuType === 'combine' ? 1 : 0,
23924
+ uuid: kmkfUtils.uuid(),
23925
+ canDelete: true,
23926
+ sellCount: 1,
23927
+ sellPrice: retailPrice,
23928
+ sellTotal: retailPrice ? (retailPrice * 1).toFixed(2) : '',
23929
+ canEdit: true,
23930
+ canUpdateNumber: canUpdateNumber
23931
+ });
23932
+ });
23933
+ };
23934
+ // 处理不同类型的商品数据
23935
+ var processWdtGoods$1 = function processWdtGoods(_ref4) {
23936
+ var list = _ref4.list,
23937
+ type = _ref4.type,
23938
+ canUpdateNumber = _ref4.canUpdateNumber;
23338
23939
  return list.map(function (item) {
23339
23940
  var processedItem = _objectSpread2(_objectSpread2({}, item), {}, {
23340
23941
  uuid: kmkfUtils.uuid(),
@@ -23352,9 +23953,9 @@ var processWdtGoods$1 = function processWdtGoods(_ref3) {
23352
23953
  return processedItem;
23353
23954
  });
23354
23955
  };
23355
- var processBsE3Goods$1 = function processBsE3Goods(_ref4) {
23356
- var list = _ref4.list,
23357
- canUpdateNumber = _ref4.canUpdateNumber;
23956
+ var processBsE3Goods$1 = function processBsE3Goods(_ref5) {
23957
+ var list = _ref5.list,
23958
+ canUpdateNumber = _ref5.canUpdateNumber;
23358
23959
  return list.map(function (item) {
23359
23960
  var specNo = item.specNo,
23360
23961
  specId = item.specId,
@@ -23389,9 +23990,9 @@ var processBsE3Goods$1 = function processBsE3Goods(_ref4) {
23389
23990
  });
23390
23991
  });
23391
23992
  };
23392
- var processGyGoods$1 = function processGyGoods(_ref5) {
23393
- var list = _ref5.list,
23394
- source = _ref5.source;
23993
+ var processGyGoods$1 = function processGyGoods(_ref6) {
23994
+ var list = _ref6.list,
23995
+ source = _ref6.source;
23395
23996
  var isFormWorkOrder = source === 'workOrder';
23396
23997
  return list.map(function (item) {
23397
23998
  var goodName = item.goodName,
@@ -23418,8 +24019,8 @@ var processGyGoods$1 = function processGyGoods(_ref5) {
23418
24019
  });
23419
24020
  });
23420
24021
  };
23421
- var processJstGoods$1 = function processJstGoods(_ref6) {
23422
- var list = _ref6.list;
24022
+ var processJstGoods$1 = function processJstGoods(_ref7) {
24023
+ var list = _ref7.list;
23423
24024
  return list.map(function (item) {
23424
24025
  return {
23425
24026
  name: item.goodName,
@@ -23437,9 +24038,9 @@ var processJstGoods$1 = function processJstGoods(_ref6) {
23437
24038
  };
23438
24039
  });
23439
24040
  };
23440
- var processKmGoods$1 = function processKmGoods(_ref7) {
23441
- var list = _ref7.list,
23442
- type = _ref7.type;
24041
+ var processKmGoods$1 = function processKmGoods(_ref8) {
24042
+ var list = _ref8.list,
24043
+ type = _ref8.type;
23443
24044
  var initParamsMap = {
23444
24045
  KM_GOODS: {
23445
24046
  num: 1
@@ -23447,31 +24048,39 @@ var processKmGoods$1 = function processKmGoods(_ref7) {
23447
24048
  KM_REISSUE_GOODS: {
23448
24049
  realNum: 1,
23449
24050
  desiredNum: 1
24051
+ },
24052
+ KM_RETURN_GOODS: {},
24053
+ KM_EXCHANGE_GOODS: {
24054
+ realNum: 1,
24055
+ desiredNum: 1
23450
24056
  }
23451
24057
  };
23452
24058
  return list.map(function (item) {
23453
24059
  return _objectSpread2(_objectSpread2({}, item), {}, {
23454
24060
  skuPropertiesName: item.specName,
24061
+ sysSkuPropertiesName: item.specId,
23455
24062
  sysTitle: item.goodName,
23456
24063
  title: null,
23457
24064
  shortTitle: item.goodShortName,
23458
24065
  sysOuterId: item.goodNo,
23459
24066
  outerId: item.goodNo,
23460
24067
  skuSysId: item.specId,
24068
+ sysSkuId: item.specId,
23461
24069
  itemSysId: item.goodId,
24070
+ sysItemId: item.goodId,
23462
24071
  sysPicPath: item.goodPicUrl,
23463
24072
  payment: null,
23464
24073
  price: item.retailPrice,
23465
- type: null,
24074
+ type: (kmkfUtils.kmSkuTypeMap === null || kmkfUtils.kmSkuTypeMap === void 0 ? void 0 : kmkfUtils.kmSkuTypeMap[item === null || item === void 0 ? void 0 : item.skuType]) || '',
23466
24075
  uuid: kmkfUtils.uuid(),
23467
24076
  canDelete: true,
23468
24077
  canEdit: true
23469
24078
  }, initParamsMap[type] || {});
23470
24079
  });
23471
24080
  };
23472
- var processDefaultGoods = function processDefaultGoods(_ref8) {
23473
- var list = _ref8.list,
23474
- canUpdateNumber = _ref8.canUpdateNumber;
24081
+ var processDefaultGoods = function processDefaultGoods(_ref9) {
24082
+ var list = _ref9.list,
24083
+ canUpdateNumber = _ref9.canUpdateNumber;
23475
24084
  return list.map(function (item) {
23476
24085
  var goodsId = item.goodsId,
23477
24086
  name = item.name,
@@ -23514,6 +24123,8 @@ var GoodsModalMap = {
23514
24123
  JST_EXCHANGE_GOODS: JstGoodsModal,
23515
24124
  KM_GOODS: KmGoodsModal,
23516
24125
  KM_REISSUE_GOODS: KmGoodsModal,
24126
+ KM_RETURN_GOODS: KmGoodsModal,
24127
+ KM_EXCHANGE_GOODS: KmGoodsModal,
23517
24128
  JY_GOODS: JyGoodsModal$1,
23518
24129
  JY_REISSUE_GOODS: JyGoodsModal$1,
23519
24130
  JKY_GOODS: JkyGoodsModal$1,
@@ -23533,6 +24144,8 @@ var systemOrderNoMap = {
23533
24144
  JKY_GOODS: 'tradeNo',
23534
24145
  JKY_REISSUE_GOODS: 'tradeNo',
23535
24146
  KM_REISSUE_GOODS: 'sid',
24147
+ KM_RETURN_GOODS: 'sid',
24148
+ KM_EXCHANGE_GOODS: 'sid',
23536
24149
  JST_REISSUE_GOODS: 'oId',
23537
24150
  GY_REISSUE_GOODS: 'code',
23538
24151
  BS_E3_REISSUE_GOODS: 'orderSn',
@@ -23558,7 +24171,10 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
23558
24171
  type = _ref$type === void 0 ? '' : _ref$type,
23559
24172
  width = _ref.width,
23560
24173
  _ref$isReissueType = _ref.isReissueType,
23561
- isReissueType = _ref$isReissueType === void 0 ? false : _ref$isReissueType;
24174
+ isReissueType = _ref$isReissueType === void 0 ? false : _ref$isReissueType,
24175
+ _ref$isReloadSelectTa = _ref.isReloadSelectTable,
24176
+ isReloadSelectTable = _ref$isReloadSelectTa === void 0 ? false : _ref$isReloadSelectTa,
24177
+ validSystemOrderFn = _ref.validSystemOrderFn;
23562
24178
  var _useState = React.useState(),
23563
24179
  _useState2 = _slicedToArray(_useState, 2),
23564
24180
  selectSystemNo = _useState2[0],
@@ -23577,7 +24193,7 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
23577
24193
  systemItemIds = dataSource === null || dataSource === void 0 ? void 0 : dataSource.filter(function (item) {
23578
24194
  return item === null || item === void 0 ? void 0 : item.sysItemId;
23579
24195
  }).map(function (item) {
23580
- 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);
24196
+ 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);
23581
24197
  });
23582
24198
  _context.next = 3;
23583
24199
  return kmkfUtils.servers.KM.getSupplierSingleton(systemItemIds);
@@ -23586,7 +24202,7 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
23586
24202
  dataSource === null || dataSource === void 0 ? void 0 : (_dataSource$filter = dataSource.filter(function (item) {
23587
24203
  return item === null || item === void 0 ? void 0 : item.sysItemId;
23588
24204
  })) === null || _dataSource$filter === void 0 ? void 0 : _dataSource$filter.forEach(function (item) {
23589
- 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);
24205
+ 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);
23590
24206
  var supplierInfo = supplierMap.get(key);
23591
24207
  item.supplierCode = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierCode;
23592
24208
  item.supplierName = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierName;
@@ -23603,36 +24219,52 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
23603
24219
  }();
23604
24220
  var openModal = /*#__PURE__*/function () {
23605
24221
  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
24222
+ var flag;
23606
24223
  return _regeneratorRuntime().wrap(function _callee2$(_context2) {
23607
24224
  while (1) switch (_context2.prev = _context2.next) {
23608
24225
  case 0:
24226
+ if (!validSystemOrderFn) {
24227
+ _context2.next = 7;
24228
+ break;
24229
+ }
24230
+ _context2.next = 3;
24231
+ return validSystemOrderFn();
24232
+ case 3:
24233
+ flag = _context2.sent;
24234
+ if (!(flag === false)) {
24235
+ _context2.next = 7;
24236
+ break;
24237
+ }
24238
+ console.log('validSystemOrderFn校验不通过');
24239
+ return _context2.abrupt("return");
24240
+ case 7:
23609
24241
  if (!validSystemOrder) {
23610
- _context2.next = 3;
24242
+ _context2.next = 10;
23611
24243
  break;
23612
24244
  }
23613
24245
  antd.message.warning('请选择补发系统单');
23614
24246
  return _context2.abrupt("return");
23615
- case 3:
23616
- if (!(getDataSourceAsync && !(dataSource === null || dataSource === void 0 ? void 0 : dataSource.length))) {
23617
- _context2.next = 6;
24247
+ case 10:
24248
+ if (!(getDataSourceAsync && (!(dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) || isReloadSelectTable))) {
24249
+ _context2.next = 13;
23618
24250
  break;
23619
24251
  }
23620
- _context2.next = 6;
24252
+ _context2.next = 13;
23621
24253
  return getDataSourceAsync();
23622
- case 6:
23623
- if (!['KM_GOODS', 'KM_REISSUE_GOODS'].includes(type)) {
23624
- _context2.next = 9;
24254
+ case 13:
24255
+ if (!['KM_GOODS', 'KM_REISSUE_GOODS', 'KM_RETURN_GOODS'].includes(type)) {
24256
+ _context2.next = 16;
23625
24257
  break;
23626
24258
  }
23627
- _context2.next = 9;
24259
+ _context2.next = 16;
23628
24260
  return getKmSupplier(dataSource);
23629
- case 9:
24261
+ case 16:
23630
24262
  setTradeGoodsVisible(true);
23631
24263
  // 补发直接传入的是systemNo
23632
24264
  if (isShowSelect && isReissueType) {
23633
24265
  setSelectSystemNo(selectedSystemOrders || []);
23634
24266
  }
23635
- case 11:
24267
+ case 18:
23636
24268
  case "end":
23637
24269
  return _context2.stop();
23638
24270
  }
@@ -23744,9 +24376,10 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
23744
24376
  }
23745
24377
  }), /*#__PURE__*/React__default['default'].createElement("span", null, "\u5DF2\u9009\u62E9(", currentTradeOriginGoods === null || currentTradeOriginGoods === void 0 ? void 0 : currentTradeOriginGoods.length, "/", filterDataSource === null || filterDataSource === void 0 ? void 0 : filterDataSource.length, ")")));
23746
24378
  };
24379
+ SelectTradeGoods.displayName = 'SelectTradeGoods';
23747
24380
  var getButtonText = function getButtonText() {
23748
24381
  var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
23749
- if (['KM_GOODS', 'KM_REISSUE_GOODS'].includes(type)) {
24382
+ if (['KM_GOODS', 'KM_REISSUE_GOODS', 'KM_EXCHANGE_GOODS'].includes(type)) {
23750
24383
  return '选择快麦ERP商品';
23751
24384
  }
23752
24385
  if (['BS_E3_GOODS', 'BS_E3_REISSUE_GOODS', 'BS_E3_EXCHANGE_GOODS'].includes(type)) {
@@ -23817,15 +24450,17 @@ var GoodItem$1 = function GoodItem(props) {
23817
24450
  _props$templateDetail = props.templateDetail,
23818
24451
  templateDetail = _props$templateDetail === void 0 ? {} : _props$templateDetail,
23819
24452
  _props$hasSelectedSys = props.hasSelectedSystemOrder,
23820
- hasSelectedSystemOrder = _props$hasSelectedSys === void 0 ? false : _props$hasSelectedSys;
24453
+ hasSelectedSystemOrder = _props$hasSelectedSys === void 0 ? false : _props$hasSelectedSys,
24454
+ isReloadSelectTable = props.isReloadSelectTable,
24455
+ validSystemOrderFn = props.validSystemOrderFn;
23821
24456
  var canDelete = ['JST_AFTERSALE_GOODS'].includes(type);
23822
24457
  var uniqueKey = (tradeGoods === null || tradeGoods === void 0 ? void 0 : tradeGoods.uniqueKey) || 'uuid';
23823
24458
  // 监听聚水潭退货商品
23824
24459
  var jstReturnGoods = antd.Form === null || antd.Form === void 0 ? void 0 : antd.Form.useWatch('3979edfd6d', form);
23825
24460
  var isShowSelectTradeGoods = type !== 'JST_EXCHANGE_GOODS' || (jstReturnGoods === null || jstReturnGoods === void 0 ? void 0 : jstReturnGoods.jstSystemOrderNo);
23826
24461
  // 判断是否为是否展示系统单筛选项
23827
- var isShowSelect = type && ['WDT_GOODS', 'BS_E3_GOODS', 'GY_GOODS', 'JST_GOODS', 'WLN_GOODS', 'KM_GOODS', 'JY_GOODS', 'JY_REISSUE_GOODS', 'JKY_GOODS', 'JKY_REISSUE_GOODS', 'GY_REISSUE_GOODS', 'KM_REISSUE_GOODS', 'BS_E3_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'JST_REISSUE_GOODS'].includes(type) || false;
23828
- var isReissueType = type && ['GY_REISSUE_GOODS', 'KM_REISSUE_GOODS', 'BS_E3_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'JST_REISSUE_GOODS', 'JY_REISSUE_GOODS'].includes(type) || false;
24462
+ 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', 'KM_RETURN_GOODS', 'BS_E3_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'JST_REISSUE_GOODS'].includes(type) || false;
24463
+ var isReissueType = type && ['GY_REISSUE_GOODS', 'KM_REISSUE_GOODS', 'BS_E3_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'JST_REISSUE_GOODS', 'JY_REISSUE_GOODS', 'JKY_REISSUE_GOODS'].includes(type) || false;
23829
24464
  var refModal = React.useRef();
23830
24465
  console.debug('表格数据', value);
23831
24466
  var handleDelete = function handleDelete(record, index) {
@@ -23914,6 +24549,8 @@ var GoodItem$1 = function GoodItem(props) {
23914
24549
  case 'GY_RETURN_GOODS':
23915
24550
  case 'KM_GOODS':
23916
24551
  case 'KM_REISSUE_GOODS':
24552
+ case 'KM_RETURN_GOODS':
24553
+ case 'KM_EXCHANGE_GOODS':
23917
24554
  case 'JY_GOODS':
23918
24555
  case 'JY_REISSUE_GOODS':
23919
24556
  case 'JKY_GOODS':
@@ -24116,6 +24753,8 @@ var GoodItem$1 = function GoodItem(props) {
24116
24753
  checked: isStrict,
24117
24754
  onChange: handleCheckboxChange
24118
24755
  }, "\u5408\u5E76\u5355\uFF0C\u52FE\u9009\u540E\u53EA\u5C55\u793A\u5F53\u524D\u5E73\u53F0\u8BA2\u5355\u5546\u54C1"), !lodash.isEmpty(tradeGoods) && isShowSelectTradeGoods && /*#__PURE__*/React__default['default'].createElement(SelectTradeGoods, {
24756
+ isReloadSelectTable: isReloadSelectTable,
24757
+ validSystemOrderFn: validSystemOrderFn,
24119
24758
  validSystemOrder: validSystemOrder,
24120
24759
  isShowSelect: isShowSelect,
24121
24760
  uniqueKey: uniqueKey,
@@ -24846,7 +25485,8 @@ var getWdtOrderListSingleton = function getWdtOrderListSingleton(orderNo) {
24846
25485
  billNo: item.tradeNo,
24847
25486
  billType: kmkfUtils.WDT_ORDER_TYPE_MAP[item.tradeType],
24848
25487
  billTag: item.tagName || item.tags,
24849
- tradeStatusValue: kmkfUtils.tradeStatusMap === null || kmkfUtils.tradeStatusMap === void 0 ? void 0 : (_tradeStatusMap$data$ = kmkfUtils.tradeStatusMap[data.data.version]) === null || _tradeStatusMap$data$ === void 0 ? void 0 : _tradeStatusMap$data$[item.tradeStatus]
25488
+ tradeStatusValue: kmkfUtils.tradeStatusMap === null || kmkfUtils.tradeStatusMap === void 0 ? void 0 : (_tradeStatusMap$data$ = kmkfUtils.tradeStatusMap[data.data.version]) === null || _tradeStatusMap$data$ === void 0 ? void 0 : _tradeStatusMap$data$[item.tradeStatus],
25489
+ logisticsName: kmkfUtils.ExpressData.getInstance('wdt').getExpressNameByCode(item === null || item === void 0 ? void 0 : item.logisticsCode, false) || (item === null || item === void 0 ? void 0 : item.logisticsName)
24850
25490
  });
24851
25491
  });
24852
25492
  }
@@ -25130,24 +25770,28 @@ var getJkyOrderListSingleton = function getJkyOrderListSingleton(orderNo) {
25130
25770
  singletonMap$7.delete(orderNo);
25131
25771
  reject(err);
25132
25772
  };
25133
- extendRequest('/qy/gdfw/order/jkyOrderDetail', {
25773
+ extendRequest('/qy/gdfw/jky/erp/trade/fullInfo', {
25134
25774
  method: 'post',
25135
25775
  data: {
25136
- billNo: orderNo
25776
+ sourceTradeNos: orderNo
25137
25777
  }
25138
25778
  }).then(function (res) {
25139
25779
  if (res === null || res === void 0 ? void 0 : res.success) {
25140
- var _res$data, _res$data$tradeOrderD, _res$data3;
25141
- if (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : (_res$data$tradeOrderD = _res$data.tradeOrderDetails) === null || _res$data$tradeOrderD === void 0 ? void 0 : _res$data$tradeOrderD.length) {
25142
- var _filterJkyOrders, _res$data2;
25143
- res.data.trades = (_filterJkyOrders = kmkfUtils.filterJkyOrders(res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.tradeOrderDetails, orderNo)) === null || _filterJkyOrders === void 0 ? void 0 : _filterJkyOrders.map(function (item) {
25780
+ var _res$data, _res$data2;
25781
+ if (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.length) {
25782
+ var _filterJkyOrders;
25783
+ res.data.trades = (_filterJkyOrders = kmkfUtils.filterJkyOrders(res === null || res === void 0 ? void 0 : res.data, orderNo)) === null || _filterJkyOrders === void 0 ? void 0 : _filterJkyOrders.map(function (item) {
25144
25784
  return _objectSpread2(_objectSpread2({}, item), {}, {
25785
+ tradeFrom: kmkfUtils.JKY_ORDER_FROM_MAP[item.tradeFrom],
25145
25786
  tradeType: kmkfUtils.JKY_ORDER_TYPE_MAP[item.tradeType],
25146
- tradeStatus: kmkfUtils.JKY_ORDER_STATUS_MAP[item.tradeStatus]
25787
+ tradeStatus: kmkfUtils.JKY_ORDER_STATUS_MAP[item.tradeStatus],
25788
+ logisticName: kmkfUtils.getJkyLogisticInfo(item, 'logisticName'),
25789
+ logisticCode: kmkfUtils.getJkyLogisticInfo(item, 'logisticCode'),
25790
+ logisticNo: kmkfUtils.getJkyLogisticInfo(item, 'logisticNo')
25147
25791
  });
25148
25792
  });
25149
25793
  }
25150
- resolve(((_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.trades) || []);
25794
+ resolve(((_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.trades) || []);
25151
25795
  // 延迟10秒清除,保证订单的时效性
25152
25796
  setTimeout(function () {
25153
25797
  singletonMap$7.delete(orderNo);
@@ -25247,6 +25891,34 @@ var index$2 = (function (props) {
25247
25891
  showHeader = _props$showHeader === void 0 ? [] : _props$showHeader;
25248
25892
  var onceRef = React.useRef(false);
25249
25893
  var valueRef = React.useRef(null);
25894
+ // 字段筛选状态 - 用户选择要筛选的字段(单选)
25895
+ var _useState = React.useState(''),
25896
+ _useState2 = _slicedToArray(_useState, 2),
25897
+ filterField = _useState2[0],
25898
+ setFilterField = _useState2[1];
25899
+ // 筛选关键词 - 输入框内容,用于模糊匹配选中字段列的值
25900
+ var _useState3 = React.useState(''),
25901
+ _useState4 = _slicedToArray(_useState3, 2),
25902
+ filterKeyword = _useState4[0],
25903
+ setFilterKeyword = _useState4[1];
25904
+ // 初始化筛选字段(仅在 type 变化时初始化)
25905
+ React.useEffect(function () {
25906
+ var allColumns = columnsMap[type] || [];
25907
+ if (showHeader && showHeader.length > 0) {
25908
+ var _validItems$;
25909
+ // showHeader 是对象数组,提取第一个 dataIndex
25910
+ var validItems = showHeader.filter(function (item) {
25911
+ return item.show !== false;
25912
+ });
25913
+ var defaultField = ((_validItems$ = validItems[0]) === null || _validItems$ === void 0 ? void 0 : _validItems$.dataIndex) || '';
25914
+ setFilterField(defaultField);
25915
+ } else {
25916
+ var _allColumns$;
25917
+ // 如果 showHeader 为空,使用第一个列
25918
+ var firstField = ((_allColumns$ = allColumns[0]) === null || _allColumns$ === void 0 ? void 0 : _allColumns$.dataIndex) || '';
25919
+ setFilterField(firstField);
25920
+ }
25921
+ }, [type]);
25250
25922
  React.useEffect(function () {
25251
25923
  var _value$orders, _value$showOrderInfo;
25252
25924
  valueRef.current = value;
@@ -25274,12 +25946,100 @@ var index$2 = (function (props) {
25274
25946
  }
25275
25947
  }, [value, type]);
25276
25948
  var columns = React.useMemo(function () {
25949
+ // 通过 getSystemShowHead 处理 showHeader 配置
25277
25950
  var baseInfoColumns = kmkfUtils.getSystemShowHead({
25278
25951
  columns: columnsMap[type] || [],
25279
25952
  showHeader: showHeader
25280
25953
  });
25281
25954
  return baseInfoColumns || [];
25282
25955
  }, [type, showHeader]);
25956
+ // 构建字段渲染值映射表(原始值 -> 显示值),用于筛选时同时匹配原始值和显示值
25957
+ var fieldRenderMap = React.useMemo(function () {
25958
+ var map = {};
25959
+ // JKY_SYSTEM_ORDER 需要处理的字段
25960
+ if (type === 'JKY_SYSTEM_ORDER') {
25961
+ // isDelete: 1 -> "是", 0 -> "否"
25962
+ map['isDelete'] = {
25963
+ '1': '是',
25964
+ '0': '否'
25965
+ };
25966
+ // tradeFrom - 订单来源映射
25967
+ map['tradeFrom'] = _objectSpread2({}, kmkfUtils.JKY_ORDER_FROM_MAP);
25968
+ // tradeType - 订单类型映射
25969
+ map['tradeType'] = _objectSpread2({}, kmkfUtils.JKY_ORDER_TYPE_MAP);
25970
+ // tradeStatus - 销售单状态映射
25971
+ map['tradeStatus'] = _objectSpread2({}, kmkfUtils.JKY_ORDER_STATUS_MAP);
25972
+ }
25973
+ // BS_E3_SYSTEM_ORDER 需要处理的字段
25974
+ if (type === 'BS_E3_SYSTEM_ORDER') {
25975
+ // orderStatus - 订单状态映射
25976
+ map['orderStatus'] = _objectSpread2({}, kmkfUtils.BS_E3_ORDER_STATUS_MAP);
25977
+ // 布尔类型字段映射
25978
+ var booleanMap = _objectSpread2({}, kmkfUtils.BS_E3_BOOLEAN_STATUS_MAP);
25979
+ ['isSplit', 'isSplitNew', 'isCombine', 'isCombineNew', 'isCopy', 'isExchangeOrder'].forEach(function (field) {
25980
+ map[field] = booleanMap;
25981
+ });
25982
+ }
25983
+ // KM_SYSTEM_ORDER 需要处理的字段
25984
+ if (type === 'KM_SYSTEM_ORDER') {
25985
+ // billType - 订单类型映射(0: "普通订单", 1: "货到付款", ...)
25986
+ map['billType'] = _objectSpread2({}, kmkfUtils.KM_ORDER_TYPE_MAP);
25987
+ // sysStatus - 订单系统状态映射
25988
+ map['sysStatus'] = _objectSpread2({}, kmkfUtils.KM_ORDER_STATUS);
25989
+ }
25990
+ // JY_SYSTEM_ORDER 需要处理的字段
25991
+ if (type === 'JY_SYSTEM_ORDER') {
25992
+ // tradeType - 订单类型映射
25993
+ map['tradeType'] = _objectSpread2({}, kmkfUtils.JY_ORDER_TYPE_MAP);
25994
+ // tradeStatus - 订单状态映射
25995
+ map['tradeStatus'] = _objectSpread2({}, kmkfUtils.JY_ORDER_STATUS_MAP);
25996
+ }
25997
+ // GY_SYSTEM_ORDER 需要处理的字段
25998
+ if (type === 'GY_SYSTEM_ORDER') {
25999
+ // deliveryStateName - 发货状态映射 (0: "未发货", 2: "全部发货")
26000
+ map['deliveryStateName'] = _objectSpread2({}, kmkfUtils.GY_DELIVERY_STATE_MAPPING);
26001
+ }
26002
+ return map;
26003
+ }, [type]);
26004
+ // 过滤后的表格数据 - 根据选中字段和关键词模糊匹配(不区分大小写)
26005
+ var filteredData = React.useMemo(function () {
26006
+ if (!filterField || !filterKeyword) {
26007
+ return (value === null || value === void 0 ? void 0 : value.orders) || [];
26008
+ }
26009
+ var keywordLower = filterKeyword.toLowerCase();
26010
+ var renderMap = fieldRenderMap[filterField];
26011
+ return ((value === null || value === void 0 ? void 0 : value.orders) || []).filter(function (item) {
26012
+ var fieldValue = item[filterField];
26013
+ if (fieldValue == null) return false;
26014
+ var fieldValueStr = String(fieldValue);
26015
+ var fieldValueLower = fieldValueStr.toLowerCase();
26016
+ // 直接匹配原始值
26017
+ if (fieldValueLower.includes(keywordLower)) return true;
26018
+ // 匹配渲染后的值
26019
+ if (renderMap) {
26020
+ // KM_SYSTEM_ORDER 的 billType 是逗号分隔的多个类型(如 "2,3,0")
26021
+ var isKmBillType = filterField === 'billType' && fieldValueStr.includes(',');
26022
+ if (isKmBillType) {
26023
+ // 拆分为单个类型代码,分别映射后拼接
26024
+ var typeCodes = fieldValueStr.split(',');
26025
+ var displayValues = typeCodes.map(function (code) {
26026
+ return renderMap[code.trim()];
26027
+ }).filter(Boolean);
26028
+ var displayValueStr = displayValues.join(',');
26029
+ if (displayValueStr.toLowerCase().includes(keywordLower)) {
26030
+ return true;
26031
+ }
26032
+ } else {
26033
+ // 单个值的字段
26034
+ var displayValue = renderMap[fieldValueStr];
26035
+ if (displayValue && displayValue.toLowerCase().includes(keywordLower)) {
26036
+ return true;
26037
+ }
26038
+ }
26039
+ }
26040
+ return false;
26041
+ });
26042
+ }, [value === null || value === void 0 ? void 0 : value.orders, filterField, filterKeyword, fieldRenderMap]);
25283
26043
  var getOrderList = /*#__PURE__*/function () {
25284
26044
  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(orderNo) {
25285
26045
  return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -25509,8 +26269,8 @@ var index$2 = (function (props) {
25509
26269
  while (1) switch (_context8.prev = _context8.next) {
25510
26270
  case 0:
25511
26271
  jyUtils.getJyOrderListSingleton(orderNo).then(function (data) {
25512
- var trades = ((data === null || data === void 0 ? void 0 : data.trades) || []).filter(function (item) {
25513
- return kmkfUtils.getIsPlatformCodesIncludeOrderNos(item.platformCode, orderNo);
26272
+ var trades = (data || []).filter(function (item) {
26273
+ return kmkfUtils.getIsPlatformCodesIncludeOrderNos(item.tradeId, orderNo);
25514
26274
  });
25515
26275
  _onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, valueRef.current || {}), {}, {
25516
26276
  orders: trades,
@@ -25540,12 +26300,9 @@ var index$2 = (function (props) {
25540
26300
  while (1) switch (_context9.prev = _context9.next) {
25541
26301
  case 0:
25542
26302
  jkyUtils.getJkyOrderListSingleton(orderNo).then(function (data) {
25543
- var trades = ((data === null || data === void 0 ? void 0 : data.trades) || []).filter(function (item) {
25544
- return kmkfUtils.getIsPlatformCodesIncludeOrderNos(item.platformCode, orderNo);
25545
- });
25546
26303
  _onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, valueRef.current || {}), {}, {
25547
- orders: trades,
25548
- showOrderInfo: trades
26304
+ orders: data || [],
26305
+ showOrderInfo: data || []
25549
26306
  }));
25550
26307
  });
25551
26308
  onceRef.current = false;
@@ -25575,25 +26332,39 @@ var index$2 = (function (props) {
25575
26332
  };
25576
26333
  }
25577
26334
  };
25578
- // useEffect(() => {
25579
- // const dom = document.querySelector(
25580
- // `.${type}_SYSTEM_ORDER_COMPONENT .ant-table-content`,
25581
- // );
25582
- // //解决列表出现横向滚动条时选择数据造成行内闪烁问题
25583
- // if (
25584
- // (value?.selectIds || []).length > 0 &&
25585
- // dom &&
25586
- // dom.scrollWidth > dom.clientWidth &&
25587
- // dom.scrollLeft === 0
25588
- // ) {
25589
- // console.log(dom.scrollWidth > dom.clientWidth, dom.scrollLeft === 0);
25590
- // dom.scrollLeft = 1;
25591
- // }
25592
- // }, [JSON.stringify(value?.selectIds || [])]);
25593
26335
  return /*#__PURE__*/React__default['default'].createElement("div", {
25594
26336
  className: "".concat(type, "_SYSTEM_ORDER_COMPONENT")
25595
- }, /*#__PURE__*/React__default['default'].createElement(antd.Table, {
25596
- dataSource: (value === null || value === void 0 ? void 0 : value.orders) || [],
26337
+ }, /*#__PURE__*/React__default['default'].createElement(antd.Space, {
26338
+ style: {
26339
+ marginBottom: 8
26340
+ }
26341
+ }, /*#__PURE__*/React__default['default'].createElement(antd.Select, {
26342
+ style: {
26343
+ width: 150
26344
+ },
26345
+ placeholder: "\u9009\u62E9\u5B57\u6BB5",
26346
+ value: filterField,
26347
+ onChange: setFilterField,
26348
+ allowClear: true,
26349
+ showSearch: true,
26350
+ optionFilterProp: "children"
26351
+ }, (columnsMap[type] || []).map(function (col) {
26352
+ return /*#__PURE__*/React__default['default'].createElement(antd.Select.Option, {
26353
+ key: col.dataIndex,
26354
+ value: col.dataIndex
26355
+ }, col.title);
26356
+ })), /*#__PURE__*/React__default['default'].createElement(antd.Input, {
26357
+ placeholder: "\u8F93\u5165\u5173\u952E\u8BCD\u6A21\u7CCA\u5339\u914D",
26358
+ style: {
26359
+ width: 200
26360
+ },
26361
+ value: filterKeyword,
26362
+ onChange: function onChange(e) {
26363
+ return setFilterKeyword(e.target.value);
26364
+ },
26365
+ allowClear: true
26366
+ })), /*#__PURE__*/React__default['default'].createElement(antd.Table, {
26367
+ dataSource: filteredData,
25597
26368
  columns: columns,
25598
26369
  rowSelection: rowSelection,
25599
26370
  rowKey: rowKeyMap[type] || 'billNo',
@@ -26522,8 +27293,8 @@ var processGyOrders = function processGyOrders(_ref4) {
26522
27293
  var processJyOrders = function processJyOrders(_ref5) {
26523
27294
  var data = _ref5.data,
26524
27295
  orderNo = _ref5.orderNo;
26525
- var trades = ((data === null || data === void 0 ? void 0 : data.trades) || []).filter(function (item) {
26526
- return kmkfUtils.getIsPlatformCodesIncludeOrderNos(item.platformCode, orderNo);
27296
+ var trades = (data || []).filter(function (item) {
27297
+ return kmkfUtils.getIsPlatformCodesIncludeOrderNos(item.tradeId, orderNo);
26527
27298
  });
26528
27299
  return trades;
26529
27300
  };
@@ -26848,7 +27619,7 @@ var CommonGoods = function CommonGoods(props) {
26848
27619
  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) {
26849
27620
  return item === null || item === void 0 ? void 0 : item.sysItemId;
26850
27621
  })) === null || _value$kmGoods$filter === void 0 ? void 0 : _value$kmGoods$filter.forEach(function (item) {
26851
- var key = item.sysSkuId == '-1' ? item.sysItemId : "".concat(item.sysItemId, "-").concat(item.sysSkuId);
27622
+ 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);
26852
27623
  map[key] = item;
26853
27624
  });
26854
27625
  }
@@ -26889,7 +27660,8 @@ var CommonGoods = function CommonGoods(props) {
26889
27660
  hasChange = false;
26890
27661
  currentValue = valueRef.current;
26891
27662
  kmGoods = currentValue === null || currentValue === void 0 ? void 0 : (_currentValue$kmGoods = currentValue.kmGoods) === null || _currentValue$kmGoods === void 0 ? void 0 : _currentValue$kmGoods.map(function (item) {
26892
- var supplierInfo = supplierMap.get(item.sysItemId);
27663
+ 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);
27664
+ var supplierInfo = supplierMap.get(key);
26893
27665
  var newSupplierCode = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierCode;
26894
27666
  var newSupplierName = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierName;
26895
27667
  // 如果供应商信息有变化,标记需要更新
@@ -27173,7 +27945,6 @@ var CommonGoods = function CommonGoods(props) {
27173
27945
  orderNo: value === null || value === void 0 ? void 0 : value.orderNo,
27174
27946
  type: compType
27175
27947
  });
27176
- console.log('getDataSourceAsync', list);
27177
27948
  onChange(_objectSpread2(_objectSpread2({}, valueRef.current), {}, {
27178
27949
  allOrders: list || []
27179
27950
  }));
@@ -27209,6 +27980,7 @@ var CommonGoods = function CommonGoods(props) {
27209
27980
  }
27210
27981
  }));
27211
27982
  };
27983
+ CommonGoods.displayName = 'CommonGoods';
27212
27984
 
27213
27985
  var componentMap$3 = {
27214
27986
  WDT_RETURN_GOODS: {
@@ -27402,6 +28174,55 @@ var componentMap$4 = {
27402
28174
  returnGoodsSysorder: 'jstReturnGoodsSysorder',
27403
28175
  returnGoodsSysorderBack: 'jstReturnGoodsSysorderBack'
27404
28176
  }
28177
+ },
28178
+ KM_EXCHANGE_GOODS: {
28179
+ type: 'km',
28180
+ showChooseTradeGoodsBtn: true,
28181
+ valueKey: 'kmExchangeGoods',
28182
+ returnTypeKey: 'kmExchangeType',
28183
+ systemOrder: 'kmSystemOrder',
28184
+ systemOrderNo: 'kmSystemOrderNo',
28185
+ oIdKey: 'billNo',
28186
+ goodDetailsKey: 'subOrders',
28187
+ skuIdKey: 'skuId',
28188
+ outerOiIdKey: '',
28189
+ name: '快麦',
28190
+ updateGoodsHandle: kmkfUtils.updateKmGoodsHandle,
28191
+ isReloadSelectTable: true,
28192
+ validSystemOrderFn: function () {
28193
+ var _validSystemOrderFn = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(form) {
28194
+ var returnGoodsValue;
28195
+ return _regeneratorRuntime().wrap(function _callee$(_context) {
28196
+ while (1) switch (_context.prev = _context.next) {
28197
+ case 0:
28198
+ _context.next = 2;
28199
+ return form.getFieldValue('KM3F7B91C2');
28200
+ case 2:
28201
+ returnGoodsValue = _context.sent;
28202
+ if (returnGoodsValue.kmSystemOrderNo) {
28203
+ _context.next = 6;
28204
+ break;
28205
+ }
28206
+ antd.message.error('请选择退货系统单');
28207
+ return _context.abrupt("return", false);
28208
+ case 6:
28209
+ case "end":
28210
+ return _context.stop();
28211
+ }
28212
+ }, _callee);
28213
+ }));
28214
+ function validSystemOrderFn(_x) {
28215
+ return _validSystemOrderFn.apply(this, arguments);
28216
+ }
28217
+ return validSystemOrderFn;
28218
+ }(),
28219
+ eventNameMap: {
28220
+ // pubsub 事件
28221
+ exchangeCopyGood: 'kmExchangeCopyGood',
28222
+ exchangeBackCopyGood: 'kmExchangeBackCopyGood',
28223
+ returnGoodsSysorder: 'kmReturnGoodsSysorder',
28224
+ returnGoodsSysorderBack: 'kmReturnGoodsSysorderBack'
28225
+ }
27405
28226
  }
27406
28227
  };
27407
28228
  var CommonExchangeGoods = function CommonExchangeGoods(props) {
@@ -27409,7 +28230,8 @@ var CommonExchangeGoods = function CommonExchangeGoods(props) {
27409
28230
  var value = props.value,
27410
28231
  onChange = props.onChange,
27411
28232
  disabled = props.disabled,
27412
- compType = props.type;
28233
+ compType = props.type,
28234
+ form = props.form;
27413
28235
  var uniqueKey = (componentMap$4 === null || componentMap$4 === void 0 ? void 0 : (_componentMap$compTyp = componentMap$4[compType]) === null || _componentMap$compTyp === void 0 ? void 0 : _componentMap$compTyp.skuIdKey) || 'uuid';
27414
28236
  var valueRef = React.useRef({});
27415
28237
  // PS: 目前选择订单商品,只有聚水潭换出商品,而且聚水潭不用考虑合并单,所以这个值一直是 false
@@ -27502,6 +28324,10 @@ var CommonExchangeGoods = function CommonExchangeGoods(props) {
27502
28324
  return new Promise(function (resolve) {
27503
28325
  pubsub__default['default'].subscribeOnce(componentMap$4[compType].eventNameMap.returnGoodsSysorderBack, function (_, data) {
27504
28326
  resolve(data);
28327
+ console.log('getDataSourceAsync---111data--', data, getGoodDetails({
28328
+ returnGoodsValue: data,
28329
+ mode: isStrict
28330
+ }));
27505
28331
  setOriginDataSource(getGoodDetails({
27506
28332
  returnGoodsValue: data,
27507
28333
  mode: isStrict
@@ -27510,9 +28336,14 @@ var CommonExchangeGoods = function CommonExchangeGoods(props) {
27510
28336
  pubsub__default['default'].publish(componentMap$4[compType].eventNameMap.returnGoodsSysorder, compType);
27511
28337
  });
27512
28338
  };
28339
+ console.log('aaa--', originDataSource);
27513
28340
  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(GoodItem$1, _objectSpread2(_objectSpread2({
27514
28341
  key: componentMap$4[compType].type
27515
28342
  }, props), {}, {
28343
+ validSystemOrderFn: function validSystemOrderFn() {
28344
+ return componentMap$4[compType].validSystemOrderFn(form);
28345
+ },
28346
+ isReloadSelectTable: componentMap$4[compType].isReloadSelectTable,
27516
28347
  disabled: disabled,
27517
28348
  canUpdateNumber: true,
27518
28349
  showChangeBtn: true,
@@ -27688,7 +28519,8 @@ var wdtReissue = function wdtReissue(props) {
27688
28519
  var newValue = _objectSpread2({}, value);
27689
28520
  // 原订单商品
27690
28521
  var originTradeGoodList = getGoodDetails({
27691
- mode: isStrict
28522
+ mode: isStrict,
28523
+ isAllOrders: true
27692
28524
  }) || [];
27693
28525
  // 当前选中的所有商品【包含了原订单+商品库】
27694
28526
  var currentSelectGoodList = (value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type22 = typeMap$1[type]) === null || _typeMap$type22 === void 0 ? void 0 : _typeMap$type22.key)]) || [];
@@ -27846,6 +28678,30 @@ var typeMap$2 = {
27846
28678
  uniqueKey: 'id',
27847
28679
  isShowSelectTradeGoods: true
27848
28680
  },
28681
+ KM_RETURN_GOODS: {
28682
+ compType: '退货',
28683
+ key: 'kmReturnGoods',
28684
+ typeName: 'kmReturnType',
28685
+ systemOrder: 'kmSystemOrder',
28686
+ systemOrderNo: 'kmSystemOrderNo',
28687
+ getOrderList: kmUtils.getOrderListSingleton,
28688
+ updateGoodsHandle: kmkfUtils.updateKmGoodsHandle,
28689
+ alwaysShowChooseErpGoodsBtn: true,
28690
+ orderTypeKey: 'orderType',
28691
+ oIdKey: 'billNo',
28692
+ outerOiIdKey: '',
28693
+ goodDetailsKey: 'subOrders',
28694
+ uniqueKey: 'id',
28695
+ isShowSelectTradeGoods: true,
28696
+ showErpGoodsBtn: false,
28697
+ eventNameMap: {
28698
+ // pubsub 事件
28699
+ exchangeCopyGood: 'kmExchangeCopyGood',
28700
+ exchangeBackCopyGood: 'kmExchangeBackCopyGood',
28701
+ returnGoodsSysorder: 'kmReturnGoodsSysorder',
28702
+ returnGoodsSysorderBack: 'kmReturnGoodsSysorderBack'
28703
+ }
28704
+ },
27849
28705
  JY_REISSUE_GOODS: {
27850
28706
  compType: '补发',
27851
28707
  key: 'jyReissueGoods',
@@ -27860,10 +28716,26 @@ var typeMap$2 = {
27860
28716
  outerOiIdKey: '',
27861
28717
  goodDetailsKey: 'subOrderDetails',
27862
28718
  isShowSelectTradeGoods: true
28719
+ },
28720
+ JKY_REISSUE_GOODS: {
28721
+ compType: '补发',
28722
+ key: 'jkyReissueGoods',
28723
+ typeName: 'jkyReissueType',
28724
+ systemOrder: 'jkySystemOrder',
28725
+ systemOrderNo: 'jkySystemOrderNo',
28726
+ getOrderList: jkyUtils.getJkyOrderListSingleton,
28727
+ updateGoodsHandle: kmkfUtils.updateJkyGoodsHandle,
28728
+ alwaysShowChooseErpGoodsBtn: true,
28729
+ orderTypeKey: 'orderType',
28730
+ oIdKey: 'tradeNo',
28731
+ outerOiIdKey: 'sourceSubtradeNo',
28732
+ goodDetailsKey: 'goodsDetail',
28733
+ isShowSelectTradeGoods: true,
28734
+ showModeBtn: true
27863
28735
  }
27864
28736
  };
27865
28737
  var PublicReissue = function PublicReissue(props) {
27866
- var _typeMap$type36, _typeMap$type42, _typeMap$type43, _typeMap$type44, _typeMap$type45, _value$typeMap$type$s8, _typeMap$type46, _typeMap$type47, _typeMap$type48, _typeMap$type49, _typeMap$type50, _typeMap$type51, _typeMap$type52, _value$typeMap$type$s9, _typeMap$type53, _typeMap$type54, _typeMap$type55, _typeMap$type56;
28738
+ var _typeMap$type18, _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, _typeMap$type54, _value$typeMap$type$s9, _typeMap$type55, _typeMap$type56, _typeMap$type57, _typeMap$type58;
27867
28739
  var value = props.value,
27868
28740
  onChange = props.onChange,
27869
28741
  _props$reasonList = props.reasonList,
@@ -27981,24 +28853,25 @@ var PublicReissue = function PublicReissue(props) {
27981
28853
  };
27982
28854
  var sysItemIdMap = React.useMemo(function () {
27983
28855
  var map = {};
27984
- if (type === 'KM_REISSUE_GOODS') {
27985
- var _value$kmReissueGoods, _value$kmReissueGoods2;
27986
- 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) {
28856
+ if (['KM_REISSUE_GOODS', 'KM_RETURN_GOODS'].includes(type)) {
28857
+ var _value$goodsKey, _value$goodsKey$filte;
28858
+ var goodsKey = typeMap$2[type].key;
28859
+ value === null || value === void 0 ? void 0 : (_value$goodsKey = value[goodsKey]) === null || _value$goodsKey === void 0 ? void 0 : (_value$goodsKey$filte = _value$goodsKey.filter(function (item) {
27987
28860
  return item === null || item === void 0 ? void 0 : item.sysItemId;
27988
- })) === null || _value$kmReissueGoods2 === void 0 ? void 0 : _value$kmReissueGoods2.forEach(function (item) {
27989
- var key = item.sysSkuId == '-1' ? item.sysItemId : "".concat(item.sysItemId, "-").concat(item.sysSkuId);
28861
+ })) === null || _value$goodsKey$filte === void 0 ? void 0 : _value$goodsKey$filte.forEach(function (item) {
28862
+ 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);
27990
28863
  map[key] = item;
27991
28864
  });
27992
28865
  }
27993
28866
  return map;
27994
- }, [value === null || value === void 0 ? void 0 : value.kmReissueGoods]);
28867
+ }, [value === null || value === void 0 ? void 0 : value[(_typeMap$type18 = typeMap$2[type]) === null || _typeMap$type18 === void 0 ? void 0 : _typeMap$type18.key]]);
27995
28868
  // 用于跟踪已经处理过的 sysItemId,避免重复处理
27996
28869
  var processedSysItemIdsRef = React.useRef(new Set());
27997
28870
  React.useEffect(function () {
27998
28871
  var fetchSupplier = /*#__PURE__*/function () {
27999
28872
  var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(sysItemIds) {
28000
- var _currentValue$kmReiss;
28001
- var needFetchIds, supplierMap, hasChange, currentValue, kmReissueGoods;
28873
+ var _currentValue$goodsKe;
28874
+ var needFetchIds, supplierMap, hasChange, currentValue, goodsKey, kmGoods;
28002
28875
  return _regeneratorRuntime().wrap(function _callee2$(_context2) {
28003
28876
  while (1) switch (_context2.prev = _context2.next) {
28004
28877
  case 0:
@@ -28026,8 +28899,10 @@ var PublicReissue = function PublicReissue(props) {
28026
28899
  // 检查是否有实际变化,避免不必要的更新
28027
28900
  hasChange = false;
28028
28901
  currentValue = valueRef.current;
28029
- kmReissueGoods = currentValue === null || currentValue === void 0 ? void 0 : (_currentValue$kmReiss = currentValue.kmReissueGoods) === null || _currentValue$kmReiss === void 0 ? void 0 : _currentValue$kmReiss.map(function (item) {
28030
- var supplierInfo = supplierMap.get(item.sysItemId);
28902
+ goodsKey = typeMap$2[type].key;
28903
+ kmGoods = currentValue === null || currentValue === void 0 ? void 0 : (_currentValue$goodsKe = currentValue[goodsKey]) === null || _currentValue$goodsKe === void 0 ? void 0 : _currentValue$goodsKe.map(function (item) {
28904
+ 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);
28905
+ var supplierInfo = supplierMap.get(key);
28031
28906
  var newSupplierCode = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierCode;
28032
28907
  var newSupplierName = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierName;
28033
28908
  // 如果供应商信息有变化,标记需要更新
@@ -28042,12 +28917,10 @@ var PublicReissue = function PublicReissue(props) {
28042
28917
  }
28043
28918
  return item;
28044
28919
  }); // 只在有实际变化时才更新
28045
- if (hasChange && kmReissueGoods) {
28046
- onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, currentValue), {}, {
28047
- kmReissueGoods: kmReissueGoods
28048
- }));
28920
+ if (hasChange && kmGoods) {
28921
+ onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, currentValue), {}, _defineProperty({}, goodsKey, kmGoods)));
28049
28922
  }
28050
- case 12:
28923
+ case 13:
28051
28924
  case "end":
28052
28925
  return _context2.stop();
28053
28926
  }
@@ -28063,20 +28936,20 @@ var PublicReissue = function PublicReissue(props) {
28063
28936
  }
28064
28937
  }, [sysItemIdMap]);
28065
28938
  var getGoodDetails = function getGoodDetails(_ref5) {
28066
- var _typeMap$type18, _typeMap$type19, _value$typeMap$type$s6, _typeMap$type20, _typeMap$type21, _typeMap$type22, _typeMap$type23, _typeMap$type24;
28939
+ var _typeMap$type19, _typeMap$type20, _value$typeMap$type$s6, _typeMap$type21, _typeMap$type22, _typeMap$type23, _typeMap$type24;
28067
28940
  var mode = _ref5.mode,
28068
28941
  sysOrderNo = _ref5.sysOrderNo,
28069
28942
  _ref5$isAllOrders = _ref5.isAllOrders,
28070
28943
  isAllOrders = _ref5$isAllOrders === void 0 ? false : _ref5$isAllOrders;
28071
- var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type18 = typeMap$2[type]) === null || _typeMap$type18 === void 0 ? void 0 : _typeMap$type18.systemOrder];
28072
- var systemOrderNo = sysOrderNo !== null && sysOrderNo !== void 0 ? sysOrderNo : value === null || value === void 0 ? void 0 : value[(_typeMap$type19 = typeMap$2[type]) === null || _typeMap$type19 === void 0 ? void 0 : _typeMap$type19.systemOrderNo];
28944
+ var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type19 = typeMap$2[type]) === null || _typeMap$type19 === void 0 ? void 0 : _typeMap$type19.systemOrder];
28945
+ var systemOrderNo = sysOrderNo !== null && sysOrderNo !== void 0 ? sysOrderNo : value === null || value === void 0 ? void 0 : value[(_typeMap$type20 = typeMap$2[type]) === null || _typeMap$type20 === void 0 ? void 0 : _typeMap$type20.systemOrderNo];
28073
28946
  var order = systemOrderNo && ((systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || []).find(function (order) {
28074
28947
  return order[typeMap$2[type].oIdKey] === systemOrderNo;
28075
28948
  });
28076
28949
  var orderRest = undefined;
28077
28950
  if (['JST_REISSUE_GOODS', 'JST_RETURN_GOODS'].includes(type)) {
28078
28951
  orderRest = true;
28079
- } else if (type === 'KM_REISSUE_GOODS') {
28952
+ } else if (['KM_REISSUE_GOODS', 'KM_RETURN_GOODS'].includes(type)) {
28080
28953
  orderRest = {
28081
28954
  orderBackGoodsLevel: props.orderBackGoodsLevel,
28082
28955
  canEdit: true
@@ -28085,14 +28958,17 @@ var PublicReissue = function PublicReissue(props) {
28085
28958
  orderRest = {
28086
28959
  canEdit: true
28087
28960
  };
28961
+ } else if (['JKY_REISSUE_GOODS'].includes(type)) {
28962
+ orderRest = {
28963
+ canEdit: true
28964
+ };
28088
28965
  }
28089
- 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] : [];
28966
+ var orders = isAllOrders ? (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s6 = value[(_typeMap$type21 = typeMap$2[type]) === null || _typeMap$type21 === void 0 ? void 0 : _typeMap$type21.systemOrder]) === null || _value$typeMap$type$s6 === void 0 ? void 0 : _value$typeMap$type$s6.orders) || [] : order ? [order] : [];
28090
28967
  var hasGoodDetails = orders === null || orders === void 0 ? void 0 : orders.some(function (order) {
28091
28968
  var _order$typeMap$type$g;
28092
28969
  return order === null || order === void 0 ? void 0 : (_order$typeMap$type$g = order[typeMap$2[type].goodDetailsKey]) === null || _order$typeMap$type$g === void 0 ? void 0 : _order$typeMap$type$g.length;
28093
28970
  });
28094
- console.log(type, orders, (_typeMap$type21 = typeMap$2[type]) === null || _typeMap$type21 === void 0 ? void 0 : _typeMap$type21.updateGoodsHandle(orders, orderRest));
28095
- var goodDetails = hasGoodDetails ? (!isAllOrders || ((_typeMap$type22 = typeMap$2[type]) === null || _typeMap$type22 === void 0 ? void 0 : _typeMap$type22.isSelectTradeGoodsMerge)) && typeMap$2[type].mergeIdenticalGoods ? typeMap$2[type].mergeIdenticalGoods((_typeMap$type23 = typeMap$2[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.updateGoodsHandle(orders, orderRest)) : (_typeMap$type24 = typeMap$2[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.updateGoodsHandle(orders, orderRest) : [];
28971
+ var goodDetails = hasGoodDetails ? (!isAllOrders || ((_typeMap$type22 = typeMap$2[type]) === null || _typeMap$type22 === void 0 ? void 0 : _typeMap$type22.isSelectTradeGoodsMerge)) && typeMap$2[type].mergeIdenticalGoods ? typeMap$2[type].mergeIdenticalGoods((_typeMap$type23 = typeMap$2[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.updateGoodsHandle(orders, orderRest, type)) : (_typeMap$type24 = typeMap$2[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.updateGoodsHandle(orders, orderRest, type) : [];
28096
28972
  var orderNo = systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orderNo;
28097
28973
  var list = mode && !isAllOrders ? goodDetails.filter(function (goodItem) {
28098
28974
  return !orderNo || goodItem[typeMap$2[type].outerOiIdKey] === orderNo;
@@ -28219,28 +29095,29 @@ var PublicReissue = function PublicReissue(props) {
28219
29095
  hasSelectedSystemOrder: showChangeBtn,
28220
29096
  // showChangeBtn={showChangeBtn || typeMap?.[type]?.isShowSelectTradeGoods}
28221
29097
  alwaysShowChooseErpGoodsBtn: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type50 = typeMap$2[type]) === null || _typeMap$type50 === void 0 ? void 0 : _typeMap$type50.alwaysShowChooseErpGoodsBtn,
28222
- // showErpGoodsBtn={typeMap?.[type]?.showErpGoodsBtn}
29098
+ showErpGoodsBtn: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type51 = typeMap$2[type]) === null || _typeMap$type51 === void 0 ? void 0 : _typeMap$type51.showErpGoodsBtn,
28223
29099
  shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
28224
- value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type51 = typeMap$2[type]) === null || _typeMap$type51 === void 0 ? void 0 : _typeMap$type51.key)],
29100
+ value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type52 = typeMap$2[type]) === null || _typeMap$type52 === void 0 ? void 0 : _typeMap$type52.key)],
28225
29101
  onChange: function onChange(val) {
28226
29102
  return changeGoodHandle(val);
28227
29103
  },
28228
29104
  onModeChange: handleModeChange,
28229
- showModeBtn: false,
29105
+ showModeBtn: !!(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type53 = typeMap$2[type]) === null || _typeMap$type53 === void 0 ? void 0 : _typeMap$type53.showModeBtn),
28230
29106
  isStrict: isStrict,
28231
- isShowSelectTradeGoods: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type52 = typeMap$2[type]) === null || _typeMap$type52 === void 0 ? void 0 : _typeMap$type52.isShowSelectTradeGoods,
28232
- systemOrders: value === null || value === void 0 ? void 0 : (_value$typeMap$type$s9 = value[(_typeMap$type53 = typeMap$2[type]) === null || _typeMap$type53 === void 0 ? void 0 : _typeMap$type53.systemOrder]) === null || _value$typeMap$type$s9 === void 0 ? void 0 : _value$typeMap$type$s9.orders,
28233
- selectedSystemOrders: showChangeBtn ? [value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type54 = typeMap$2[type]) === null || _typeMap$type54 === void 0 ? void 0 : _typeMap$type54.systemOrderNo)]] : [],
29107
+ isShowSelectTradeGoods: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type54 = typeMap$2[type]) === null || _typeMap$type54 === void 0 ? void 0 : _typeMap$type54.isShowSelectTradeGoods,
29108
+ systemOrders: value === null || value === void 0 ? void 0 : (_value$typeMap$type$s9 = value[(_typeMap$type55 = typeMap$2[type]) === null || _typeMap$type55 === void 0 ? void 0 : _typeMap$type55.systemOrder]) === null || _value$typeMap$type$s9 === void 0 ? void 0 : _value$typeMap$type$s9.orders,
29109
+ selectedSystemOrders: showChangeBtn ? [value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type56 = typeMap$2[type]) === null || _typeMap$type56 === void 0 ? void 0 : _typeMap$type56.systemOrderNo)]] : [],
28234
29110
  tradeGoods: {
28235
29111
  originDataSource: getGoodDetails({
28236
29112
  mode: isStrict,
28237
- isAllOrders: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type55 = typeMap$2[type]) === null || _typeMap$type55 === void 0 ? void 0 : _typeMap$type55.isShowSelectTradeGoods
29113
+ isAllOrders: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type57 = typeMap$2[type]) === null || _typeMap$type57 === void 0 ? void 0 : _typeMap$type57.isShowSelectTradeGoods
28238
29114
  }),
28239
- uniqueKey: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type56 = typeMap$2[type]) === null || _typeMap$type56 === void 0 ? void 0 : _typeMap$type56.uniqueKey) || 'uuid',
29115
+ uniqueKey: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type58 = typeMap$2[type]) === null || _typeMap$type58 === void 0 ? void 0 : _typeMap$type58.uniqueKey) || 'uuid',
28240
29116
  selectedGoodsChange: selectedGoodsChange
28241
29117
  }
28242
29118
  })));
28243
29119
  };
29120
+ PublicReissue.displayName = 'PublicReissue';
28244
29121
 
28245
29122
  var css_248z$g = ".goodsBox {\n display: flex;\n flex-wrap: wrap;\n}\n.goods-imgBox {\n position: relative;\n width: 80px;\n height: 80px;\n border: 1px solid #F2F3F5;\n margin: 0 10px 10px 0;\n text-align: center;\n}\n.icon-close {\n position: absolute;\n top: -5px;\n right: -5px;\n width: 13px;\n height: 13px;\n display: flex;\n justify-content: center;\n align-items: center;\n border-radius: 50%;\n z-index: 3;\n background-color: #fff;\n cursor: pointer;\n}\n.img {\n width: 100%;\n height: 100%;\n -o-object-fit: contain;\n object-fit: contain;\n}\n.goods-title {\n margin: 0 0 10px 5px;\n color: #4E5969;\n}\n.deg90 {\n transform: rotate(90deg);\n}\n.goodMain {\n display: flex;\n flex-wrap: wrap;\n height: 265px;\n overflow-y: auto;\n margin-bottom: 10px;\n}\n.goodMain .goodItem {\n width: 140px;\n height: 175px;\n padding: 11px 10px 0;\n text-align: center;\n display: inline-block;\n vertical-align: top;\n margin-bottom: 10px;\n margin-right: 30px;\n border: 1px solid #e6e6e6;\n cursor: pointer;\n transition: border 0.3s;\n}\n.goodMain .goodItem .goodImg {\n width: 120px;\n height: 120px;\n}\n.goodMain .goodItem .goodText {\n overflow: hidden;\n text-overflow: ellipsis;\n white-space: nowrap;\n}\n.goodMain .goodItem.active {\n border: 1px solid #3089dc;\n}\n.right-context {\n display: flex;\n flex-direction: column;\n}\n";
28246
29123
  styleInject(css_248z$g);