@kmkf-fe-packages/basic-components 2.2.44-beta.7 → 2.2.44-beta.73

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (10) hide show
  1. package/dist/index.esm.js +441 -286
  2. package/dist/index.js +440 -285
  3. package/dist/src/bs/component/GoodItem/index.d.ts +4 -1
  4. package/dist/src/bs/component/model/Columns/Erp/jky.d.ts +5 -19
  5. package/dist/src/bs/component/model/Columns/Erp/wdt.d.ts +6 -0
  6. package/dist/src/bs/component/model/JkyGoodsModal/GoodsList.d.ts +1 -1
  7. package/dist/src/common/CommonGoods/index.d.ts +4 -1
  8. package/dist/src/common/Reissue/index.d.ts +4 -1
  9. package/dist/src/constants/systemOrderColumnsMap.d.ts +10 -2
  10. package/package.json +3 -3
package/dist/index.js CHANGED
@@ -7773,9 +7773,10 @@ var Province = function Province(props) {
7773
7773
  wdt: kmkfUtils.WdtAddressData.getInstance(),
7774
7774
  gy: kmkfUtils.GyAddressData.getInstance(),
7775
7775
  km: kmkfUtils.AddressData.getInstance(),
7776
- jst: kmkfUtils.JstAddressData.getInstance(),
7777
- jky: kmkfUtils.JkyAddressData.getInstance()
7776
+ jst: kmkfUtils.JstAddressData.getInstance()
7777
+ // jky: JkyAddressData.getInstance(),
7778
7778
  };
7779
+
7779
7780
  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Cascader, _objectSpread2(_objectSpread2({}, props), {}, {
7780
7781
  options: ((_mapping$type = mapping[type]) === null || _mapping$type === void 0 ? void 0 : _mapping$type.addressOptions) || [],
7781
7782
  style: {
@@ -7950,7 +7951,8 @@ var IdentifyAddress = function IdentifyAddress(props) {
7950
7951
  placeholder: "\u6536\u4EF6\u4EBA\u59D3\u540D",
7951
7952
  allowClear: true,
7952
7953
  onChange: function onChange(e) {
7953
- 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');
7954
7956
  }
7955
7957
  }), /*#__PURE__*/React__default['default'].createElement(antd.Input, {
7956
7958
  value: value.receiverMobile,
@@ -7958,7 +7960,8 @@ var IdentifyAddress = function IdentifyAddress(props) {
7958
7960
  allowClear: true,
7959
7961
  placeholder: "\u6536\u4EF6\u4EBA\u7535\u8BDD",
7960
7962
  onChange: function onChange(e) {
7961
- 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');
7962
7965
  }
7963
7966
  })), /*#__PURE__*/React__default['default'].createElement(antd.Space, {
7964
7967
  wrap: true
@@ -7975,7 +7978,8 @@ var IdentifyAddress = function IdentifyAddress(props) {
7975
7978
  placeholder: "\u8BE6\u7EC6\u5730\u5740",
7976
7979
  allowClear: true,
7977
7980
  onChange: function onChange(e) {
7978
- 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');
7979
7983
  }
7980
7984
  })));
7981
7985
  };
@@ -8011,13 +8015,14 @@ function ApaasPosting(props) {
8011
8015
  });
8012
8016
  }
8013
8017
 
8014
- var _excluded$b = ["value", "onChange", "platformType", "type"];
8018
+ var _excluded$b = ["value", "onChange", "platformType", "type", "placement"];
8015
8019
  function ApaasLogistics(props) {
8016
8020
  var value = props.value,
8017
8021
  onChange = props.onChange,
8018
8022
  platformType = props.platformType,
8019
8023
  _props$type = props.type,
8020
8024
  type = _props$type === void 0 ? 'select' : _props$type,
8025
+ placement = props.placement,
8021
8026
  other = _objectWithoutProperties(props, _excluded$b);
8022
8027
  var _useState = React.useState([]),
8023
8028
  _useState2 = _slicedToArray(_useState, 2),
@@ -8055,12 +8060,13 @@ function ApaasLogistics(props) {
8055
8060
  return type === 'input' ? /*#__PURE__*/React__default['default'].createElement(antd.Input, _objectSpread2(_objectSpread2({}, other), {}, {
8056
8061
  value: value,
8057
8062
  onChange: handleInputChange
8058
- })) : /*#__PURE__*/React__default['default'].createElement(antd.Select, _objectSpread2(_objectSpread2({}, other), {}, {
8063
+ })) : /*#__PURE__*/React__default['default'].createElement(antd.Select, _objectSpread2({
8059
8064
  value: value,
8060
8065
  onChange: onChange,
8061
8066
  options: option,
8062
- virtual: true
8063
- }));
8067
+ virtual: true,
8068
+ placement: placement
8069
+ }, other));
8064
8070
  }
8065
8071
 
8066
8072
  var _excluded$c = ["label", "name", "extra", "required", "rules", "initialValue"];
@@ -8144,6 +8150,11 @@ var systemOrderMap = {
8144
8150
  ids: 'wdtSystemSelectIds',
8145
8151
  order: 'wdtSystemShowOrder'
8146
8152
  },
8153
+ JKY_SYSTEM_ORDER: {
8154
+ no: 'jkySystemOrderNo',
8155
+ ids: 'jkySystemSelectIds',
8156
+ order: 'jkySystemShowOrder'
8157
+ },
8147
8158
  BS_E3_SYSTEM_ORDER: {
8148
8159
  no: 'bsE3SystemOrderNo',
8149
8160
  ids: 'bsE3SystemSelectIds',
@@ -8621,7 +8632,8 @@ var processSceneStatus = function processSceneStatus(getValue) {
8621
8632
  WAREHOUSING_STATUS: 'inStockStatusItemList',
8622
8633
  BS_E3_WAREHOUSING_STATUS: 'bsE3InStockStatusItemList',
8623
8634
  MSG_STATUS: 'msgStatusValues',
8624
- WDT_WAREHOUSING_STATUS: 'wdtInStockStatusItemList'
8635
+ WDT_WAREHOUSING_STATUS: 'wdtInStockStatusItemList',
8636
+ JKY_WAREHOUSING_STATUS: 'jkyInStockStatusItemList'
8625
8637
  };
8626
8638
  return _defineProperty({}, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_").concat(STATUS_LIST_MAP[nex.workOrderComponentType])), []));
8627
8639
  };
@@ -8715,6 +8727,33 @@ var processBsGoods = function processBsGoods(getValue) {
8715
8727
  return _defineProperty({}, nex.uniqueKey, _values);
8716
8728
  };
8717
8729
  };
8730
+ var processJkyGoods = function processJkyGoods(templateColumns) {
8731
+ return function (getValue) {
8732
+ return function (nex, config) {
8733
+ var _values = {
8734
+ jkyGoods: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_jkyGoods")), []),
8735
+ shopCode: getValue("".concat(nex.uniqueKey, "_shopCode"))
8736
+ };
8737
+ var selectIds = [];
8738
+ var orderNo = '';
8739
+ var tradeId = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
8740
+ return col.workOrderComponentType === 'TRADE_ID_INPUT';
8741
+ });
8742
+ if (tradeId) {
8743
+ orderNo = getValue("".concat(tradeId.uniqueKey, "_").concat(updateWorkTypeKeys[tradeId.workOrderComponentType]));
8744
+ }
8745
+ var jkySystemOrder = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
8746
+ return col.workOrderComponentType === 'JKY_SYSTEM_ORDER';
8747
+ });
8748
+ if (jkySystemOrder) {
8749
+ selectIds = jsonParseSecurity(getValue("".concat(jkySystemOrder.uniqueKey, "_").concat(systemOrderMap[jkySystemOrder.workOrderComponentType].ids)), []);
8750
+ }
8751
+ _values.selectIds = selectIds;
8752
+ _values.orderNo = orderNo;
8753
+ return _defineProperty({}, nex.uniqueKey, _values);
8754
+ };
8755
+ };
8756
+ };
8718
8757
  var processWdtGoods = function processWdtGoods(templateColumns) {
8719
8758
  return function (getValue) {
8720
8759
  return function (nex, config) {
@@ -9006,6 +9045,11 @@ var processErpSystemOrder = function processErpSystemOrder(getValue) {
9006
9045
  ids: 'wdtSystemSelectIds',
9007
9046
  order: 'wdtSystemShowOrder'
9008
9047
  },
9048
+ JKY_SYSTEM_ORDER: {
9049
+ no: 'jkySystemOrderNo',
9050
+ ids: 'jkySystemSelectIds',
9051
+ order: 'jkySystemShowOrder'
9052
+ },
9009
9053
  BS_E3_SYSTEM_ORDER: {
9010
9054
  no: 'bsE3SystemOrderNo',
9011
9055
  ids: 'bsE3SystemSelectIds',
@@ -9265,14 +9309,14 @@ var processJstReturnGoods = function processJstReturnGoods(templateColumns) {
9265
9309
  };
9266
9310
  var processLabel = function processLabel(getValue) {
9267
9311
  return function (nex, config) {
9268
- var _ref73;
9269
- 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;
9312
+ var _ref74;
9313
+ return _ref74 = {}, _defineProperty(_ref74, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _defineProperty(_ref74, "".concat(nex.uniqueKey, "_label"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _ref74;
9270
9314
  };
9271
9315
  };
9272
9316
  var processMemberLevel = function processMemberLevel(getValue) {
9273
9317
  return function (nex, config) {
9274
- var _ref74;
9275
- 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;
9318
+ var _ref75;
9319
+ return _ref75 = {}, _defineProperty(_ref75, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _defineProperty(_ref75, "".concat(nex.uniqueKey, "_memberLevel"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _ref75;
9276
9320
  };
9277
9321
  };
9278
9322
  var processAfterSalesOrderId = function processAfterSalesOrderId(getValue) {
@@ -9376,6 +9420,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
9376
9420
  BS_E3_WAREHOUSING_STATUS: processSceneStatus,
9377
9421
  MSG_STATUS: processSceneStatus,
9378
9422
  WDT_WAREHOUSING_STATUS: processSceneStatus,
9423
+ JKY_WAREHOUSING_STATUS: processSceneStatus,
9379
9424
  BS_LOGISTICS: processErpLogistics,
9380
9425
  WLN_LOGISTICS: processErpLogistics,
9381
9426
  WDT_LOGISTICS: processErpLogistics,
@@ -9391,6 +9436,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
9391
9436
  BS_POSTING: processBsPosting,
9392
9437
  BS_GOODS: processBsGoods,
9393
9438
  WDT_GOODS: processWdtGoods(templateColumns),
9439
+ JKY_GOODS: processJkyGoods(templateColumns),
9394
9440
  WDT_AFTERSALE_GOODS: processWdtAftersaleGoods(templateColumns),
9395
9441
  JST_AFTERSALE_GOODS: processJstAftersaleGoods(templateColumns),
9396
9442
  BS_E3_GOODS: processBsE3Goods(templateColumns),
@@ -9409,6 +9455,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
9409
9455
  KM_SYSTEM_ORDER: processErpSystemOrder,
9410
9456
  WLN_SYSTEM_ORDER: processErpSystemOrder,
9411
9457
  WDT_SYSTEM_ORDER: processErpSystemOrder,
9458
+ JKY_SYSTEM_ORDER: processErpSystemOrder,
9412
9459
  WDT_RETURN_BILL_NO: processErpSystemOrder,
9413
9460
  BS_E3_SYSTEM_ORDER: processErpSystemOrder,
9414
9461
  JST_SYSTEM_ORDER: processErpSystemOrder,
@@ -10005,12 +10052,21 @@ var EditSplitRenderMap = {
10005
10052
  updateHandle = _ref17.updateHandle,
10006
10053
  disabled = _ref17.disabled;
10007
10054
  return /*#__PURE__*/React__default['default'].createElement(ApaasLogistics, {
10055
+ getPopupContainer: function getPopupContainer() {
10056
+ return document.getElementById('subform');
10057
+ },
10008
10058
  value: val,
10009
10059
  allowClear: true,
10060
+ showSearch: true,
10010
10061
  onChange: function onChange(e) {
10011
10062
  return updateHandle(e, index, t.key);
10012
10063
  },
10013
- disabled: t.isEdit || disabled
10064
+ disabled: t.isEdit || disabled,
10065
+ filterOption: function filterOption(input, option) {
10066
+ return option.label.includes(input);
10067
+ },
10068
+ placement: "topLeft",
10069
+ listHeight: 120
10014
10070
  });
10015
10071
  },
10016
10072
  //退货物流-物流公司
@@ -10021,12 +10077,21 @@ var EditSplitRenderMap = {
10021
10077
  updateHandle = _ref18.updateHandle,
10022
10078
  disabled = _ref18.disabled;
10023
10079
  return /*#__PURE__*/React__default['default'].createElement(ApaasLogistics, {
10080
+ getPopupContainer: function getPopupContainer() {
10081
+ return document.getElementById('subform');
10082
+ },
10024
10083
  value: val,
10025
10084
  allowClear: true,
10085
+ showSearch: true,
10026
10086
  onChange: function onChange(e) {
10027
10087
  return updateHandle(e, index, t.key);
10028
10088
  },
10029
- disabled: t.isEdit || disabled
10089
+ disabled: t.isEdit || disabled,
10090
+ filterOption: function filterOption(input, option) {
10091
+ return option.label.includes(input);
10092
+ },
10093
+ placement: "topLeft",
10094
+ listHeight: 120
10030
10095
  });
10031
10096
  }
10032
10097
  };
@@ -10495,7 +10560,11 @@ var SubForm = function SubForm(props) {
10495
10560
  });
10496
10561
  }, [inputValue]);
10497
10562
  var handleOpenChange = function handleOpenChange(newOpen) {
10498
- setOpen(newOpen);
10563
+ if (!['jbCFrJV4m7_trajectoryCompany', '0qFEv9GEyd_returnLogisticsCompany'].includes(selectKey)) {
10564
+ setOpen(newOpen);
10565
+ } else {
10566
+ setOpen(false);
10567
+ }
10499
10568
  };
10500
10569
  var onChangeInput = React.useCallback(lodash.debounce(function (val) {
10501
10570
  setInputValue(val);
@@ -10583,6 +10652,9 @@ var SubForm = function SubForm(props) {
10583
10652
  visible: open,
10584
10653
  onVisibleChange: handleOpenChange
10585
10654
  }, ['0qFEv9GEyd_returnLogisticsCompany', 'jbCFrJV4m7_trajectoryCompany'].includes(selectKey) ? /*#__PURE__*/React__default['default'].createElement(ApaasLogistics, {
10655
+ getPopupContainer: function getPopupContainer() {
10656
+ return document.getElementById('subform');
10657
+ },
10586
10658
  value: undefined,
10587
10659
  onChange: function onChange(val) {
10588
10660
  onChangeInput(val);
@@ -10595,7 +10667,9 @@ var SubForm = function SubForm(props) {
10595
10667
  },
10596
10668
  filterOption: function filterOption(input, option) {
10597
10669
  return option.label.includes(input);
10598
- }
10670
+ },
10671
+ placement: "topLeft",
10672
+ listHeight: 120
10599
10673
  }) : /*#__PURE__*/React__default['default'].createElement(antd.Input, {
10600
10674
  placeholder: "\u8F93\u5165\u5173\u952E\u8BCD\u67E5\u8BE2",
10601
10675
  allowClear: true,
@@ -10672,7 +10746,8 @@ var BuyerNick = function BuyerNick(props) {
10672
10746
  disabled = props.disabled,
10673
10747
  _onBlur = props.onBlur;
10674
10748
  var changeValue = function changeValue(e, type) {
10675
- onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, type, e.target.value)));
10749
+ var _e$target$value;
10750
+ 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())));
10676
10751
  };
10677
10752
  // useEffect(() => {
10678
10753
  // //淘宝平台和抖音平台需要展示买家id
@@ -10697,7 +10772,8 @@ var BuyerNick = function BuyerNick(props) {
10697
10772
  changeValue(e, 'buyerNick');
10698
10773
  },
10699
10774
  onBlur: function onBlur(e) {
10700
- _onBlur === null || _onBlur === void 0 ? void 0 : _onBlur(e.target.value, 'buyerNick');
10775
+ var _e$target$value2;
10776
+ _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');
10701
10777
  }
10702
10778
  });
10703
10779
  };
@@ -10819,8 +10895,9 @@ var RemarkInput = function RemarkInput(props) {
10819
10895
  onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
10820
10896
  };
10821
10897
  var changeRemark = function changeRemark(e) {
10898
+ var _e$target$value;
10822
10899
  var newValue = _objectSpread2(_objectSpread2({}, value), {}, {
10823
- remark: e.target.value
10900
+ remark: (_e$target$value = e.target.value) === null || _e$target$value === void 0 ? void 0 : _e$target$value.trim()
10824
10901
  });
10825
10902
  onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
10826
10903
  };
@@ -10863,7 +10940,7 @@ var Logistics = function Logistics(props) {
10863
10940
  var handleInputChange = function handleInputChange(e) {
10864
10941
  var val = e.target.value;
10865
10942
  typeof onChange === 'function' && onChange(_objectSpread2(_objectSpread2({}, value), {}, {
10866
- order: val
10943
+ order: val === null || val === void 0 ? void 0 : val.trim()
10867
10944
  }));
10868
10945
  };
10869
10946
  var handelSelectChange = function handelSelectChange(val) {
@@ -10927,7 +11004,8 @@ var AliPay = function AliPay(props) {
10927
11004
  disabled = props.disabled,
10928
11005
  _onBlur = props.onBlur;
10929
11006
  var changeValue = function changeValue(e, type) {
10930
- onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, type, e.target.value)));
11007
+ var _e$target$value;
11008
+ 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())));
10931
11009
  };
10932
11010
  return /*#__PURE__*/React__default['default'].createElement("div", null, !isSingle ? /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
10933
11011
  disabled: disabled,
@@ -12114,7 +12192,7 @@ var ChooseBaby = function ChooseBaby(props) {
12114
12192
  }));
12115
12193
  };
12116
12194
 
12117
- 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";
12195
+ 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";
12118
12196
  styleInject(css_248z$7);
12119
12197
 
12120
12198
  var GoodItem = function GoodItem(props) {
@@ -12443,13 +12521,22 @@ var GoodItem = function GoodItem(props) {
12443
12521
  var hasAttr = React.useMemo(function () {
12444
12522
  return hasPic ? headerList.length > 1 : headerList.length > 0;
12445
12523
  }, [hasPic, headerList]);
12524
+ var clearAll = function clearAll() {
12525
+ onChange === null || onChange === void 0 ? void 0 : onChange({
12526
+ shopId: shopId,
12527
+ imgList: []
12528
+ });
12529
+ };
12446
12530
  return /*#__PURE__*/React__default['default'].createElement("div", null, imgList.length === 0 ? /*#__PURE__*/React__default['default'].createElement("p", {
12447
12531
  className: "goods-title"
12448
12532
  }, "\u6700\u591A\u6DFB\u52A0", maxLength, "\u4E2A\u5B9D\u8D1D") : /*#__PURE__*/React__default['default'].createElement("p", {
12449
12533
  className: "goods-uploaded-state"
12450
12534
  }, "\u5DF2\u6DFB\u52A0", /*#__PURE__*/React__default['default'].createElement("span", {
12451
12535
  className: "goods-uploaded-count"
12452
- }, imgList.length), "/", maxLength, "\u4E2A\u5B9D\u8D1D"), /*#__PURE__*/React__default['default'].createElement("div", {
12536
+ }, imgList.length), "/", maxLength, /*#__PURE__*/React__default['default'].createElement("span", {
12537
+ className: 'clear-all',
12538
+ onClick: clearAll
12539
+ }, "\u6E05\u7A7A")), /*#__PURE__*/React__default['default'].createElement("div", {
12453
12540
  ref: boxRef,
12454
12541
  id: "goods-wrap",
12455
12542
  className: "goodsBox goodsBox-item-horizontal--box".concat(isSingleRow ? ' single-row' : '')
@@ -12589,7 +12676,8 @@ var Invoice = function Invoice(props) {
12589
12676
  }),
12590
12677
  current = _useRef.current;
12591
12678
  var handleInputChange = function handleInputChange(e) {
12592
- var ordinaryTaitou = e.target.value;
12679
+ var _e$target$value;
12680
+ var ordinaryTaitou = (_e$target$value = e.target.value) === null || _e$target$value === void 0 ? void 0 : _e$target$value.trim();
12593
12681
  setVisible(false);
12594
12682
  setList([]);
12595
12683
  var newValue = _objectSpread2(_objectSpread2({}, value), {}, {
@@ -12612,8 +12700,9 @@ var Invoice = function Invoice(props) {
12612
12700
  handleChange(ordinaryTaitou);
12613
12701
  };
12614
12702
  var handleValueClick = function handleValueClick(e) {
12703
+ var _e$target$value2;
12615
12704
  var newValue = _objectSpread2(_objectSpread2({}, value), {}, {
12616
- ordinarySerial: e.target.value
12705
+ ordinarySerial: (_e$target$value2 = e.target.value) === null || _e$target$value2 === void 0 ? void 0 : _e$target$value2.trim()
12617
12706
  });
12618
12707
  onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2({}, newValue));
12619
12708
  };
@@ -12924,7 +13013,8 @@ var Payment = function Payment(props) {
12924
13013
  // }
12925
13014
  // }, [shopId, shopList]);
12926
13015
  var changeValue = function changeValue(e, type) {
12927
- var newValue = _objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, type, e.target.value));
13016
+ var _e$target$value;
13017
+ 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()));
12928
13018
  onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
12929
13019
  type === 'enterprisePaymentTid' && (onSearch === null || onSearch === void 0 ? void 0 : onSearch(e));
12930
13020
  };
@@ -12985,7 +13075,8 @@ var Payment = function Payment(props) {
12985
13075
  return changeValue(e, item.name);
12986
13076
  },
12987
13077
  onBlur: function onBlur(e) {
12988
- return _onBlur === null || _onBlur === void 0 ? void 0 : _onBlur(e.target.value, item.name);
13078
+ var _e$target$value2;
13079
+ 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);
12989
13080
  }
12990
13081
  }), (replaceValueCh === null || replaceValueCh === void 0 ? void 0 : replaceValueCh[item.name]) && /*#__PURE__*/React__default['default'].createElement("p", {
12991
13082
  style: {
@@ -13278,7 +13369,8 @@ var LogisticsInterception = function LogisticsInterception(props) {
13278
13369
  disabled: disabled || isEdit,
13279
13370
  placeholder: "\u7269\u6D41\u5355\u53F7",
13280
13371
  onChange: function onChange(e) {
13281
- return changeHandle(e.target.value, 'interceptCode');
13372
+ var _e$target$value;
13373
+ return changeHandle((_e$target$value = e.target.value) === null || _e$target$value === void 0 ? void 0 : _e$target$value.trim(), 'interceptCode');
13282
13374
  },
13283
13375
  value: value === null || value === void 0 ? void 0 : value.interceptCode
13284
13376
  }))), /*#__PURE__*/React__default['default'].createElement(antd.Space, null, /*#__PURE__*/React__default['default'].createElement(Item, {
@@ -13353,7 +13445,8 @@ var LogisticsInterception = function LogisticsInterception(props) {
13353
13445
  disabled: disabled || isEdit,
13354
13446
  placeholder: senderMobileLabel,
13355
13447
  onChange: function onChange(e) {
13356
- return changeHandle(e.target.value, 'interceptSenderMobile');
13448
+ var _e$target$value2;
13449
+ return changeHandle((_e$target$value2 = e.target.value) === null || _e$target$value2 === void 0 ? void 0 : _e$target$value2.trim(), 'interceptSenderMobile');
13357
13450
  }
13358
13451
  })), /*#__PURE__*/React__default['default'].createElement(Item, {
13359
13452
  label: '退回地址',
@@ -13412,7 +13505,8 @@ var LogisticsInterception = function LogisticsInterception(props) {
13412
13505
  },
13413
13506
  placeholder: "\u5176\u4ED6",
13414
13507
  onChange: function onChange(e) {
13415
- return changeHandle(e.target.value, 'interceptLogisticsStatusOther');
13508
+ var _e$target$value3;
13509
+ return changeHandle((_e$target$value3 = e.target.value) === null || _e$target$value3 === void 0 ? void 0 : _e$target$value3.trim(), 'interceptLogisticsStatusOther');
13416
13510
  }
13417
13511
  })), /*#__PURE__*/React__default['default'].createElement(Item, {
13418
13512
  label: '拦截状态',
@@ -13466,7 +13560,8 @@ var LogisticsInterception = function LogisticsInterception(props) {
13466
13560
  disabled: true,
13467
13561
  placeholder: "\u63A5\u53E3\u72B6\u6001\u539F\u56E0",
13468
13562
  onChange: function onChange(e) {
13469
- return changeHandle(e.target.value, 'interceptLogisticsApiStatusReason');
13563
+ var _e$target$value4;
13564
+ return changeHandle((_e$target$value4 = e.target.value) === null || _e$target$value4 === void 0 ? void 0 : _e$target$value4.trim(), 'interceptLogisticsApiStatusReason');
13470
13565
  }
13471
13566
  })));
13472
13567
  };
@@ -13542,7 +13637,7 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
13542
13637
  trajectoryApiStatus = _props$trajectoryApiS === void 0 ? false : _props$trajectoryApiS;
13543
13638
  var handleInputChange = function handleInputChange(e, type) {
13544
13639
  var val = e.target.value;
13545
- typeof onChange === 'function' && onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, type, val)));
13640
+ typeof onChange === 'function' && onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, type, val === null || val === void 0 ? void 0 : val.trim())));
13546
13641
  };
13547
13642
  var handelSelectChange = function handelSelectChange(val) {
13548
13643
  typeof onChange === 'function' && onChange(_objectSpread2(_objectSpread2({}, value), {}, {
@@ -14024,7 +14119,7 @@ var jstGoods = function jstGoods(props) {
14024
14119
  };
14025
14120
  var changeInputHandle = function changeInputHandle(val, type) {
14026
14121
  var changeOrderInfo = _objectSpread2({}, value[changeIndex]);
14027
- changeOrderInfo[type] = val;
14122
+ changeOrderInfo[type] = val === null || val === void 0 ? void 0 : val.trim();
14028
14123
  var newList = _toConsumableArray(value);
14029
14124
  newList[changeIndex] = changeOrderInfo;
14030
14125
  onChange === null || onChange === void 0 ? void 0 : onChange(newList);
@@ -14946,6 +15041,13 @@ var wdtColumns = [{
14946
15041
  title: '辅助单位',
14947
15042
  width: 150,
14948
15043
  render: renderTextEllipsis
15044
+ }, {
15045
+ dataIndex: 'skuType',
15046
+ title: '是否组合装',
15047
+ width: 150,
15048
+ render: function render(type) {
15049
+ return type === 'suite' ? '组合装' : '非组合装';
15050
+ }
14949
15051
  }];
14950
15052
 
14951
15053
  var bse3Columns = [{
@@ -15336,34 +15438,75 @@ var jyColumns = [{
15336
15438
  }
15337
15439
  }];
15338
15440
 
15441
+ var getYesOrNo$2 = function getYesOrNo(val) {
15442
+ if (!lodash.isBoolean(val)) return null;
15443
+ return val ? '是' : '否';
15444
+ };
15339
15445
  var jkyColumns = [{
15340
- dataIndex: 'goodsNo',
15341
- title: "\u8D27\u54C1\u7F16\u53F7",
15446
+ dataIndex: 'goodName',
15447
+ title: "\u8D27\u54C1\u540D\u79F0",
15342
15448
  align: 'center',
15343
15449
  ellipsis: true,
15344
15450
  width: 150,
15345
15451
  render: renderTextEllipsis
15346
15452
  }, {
15347
- dataIndex: 'goodsName',
15348
- title: "\u8D27\u54C1\u540D\u79F0",
15453
+ dataIndex: 'goodNo',
15454
+ title: "\u8D27\u54C1\u7F16\u53F7",
15349
15455
  align: 'center',
15350
15456
  ellipsis: true,
15351
15457
  width: 150,
15352
15458
  render: renderTextEllipsis
15353
15459
  }, {
15354
- dataIndex: 'goodsId',
15460
+ dataIndex: 'goodId',
15355
15461
  title: "\u8D27\u54C1ID",
15356
15462
  align: 'center',
15357
15463
  ellipsis: true,
15358
15464
  width: 150,
15359
15465
  render: renderTextEllipsis
15360
15466
  }, {
15361
- dataIndex: 'barcode',
15467
+ dataIndex: 'goodPicUrl',
15468
+ title: "\u8D27\u54C1\u4E3B\u56FE",
15469
+ align: 'center',
15470
+ ellipsis: true,
15471
+ width: 150,
15472
+ render: function render(picUrl) {
15473
+ return /*#__PURE__*/React__default['default'].createElement("img", {
15474
+ style: {
15475
+ width: '30px',
15476
+ height: '30px',
15477
+ objectFit: 'contain'
15478
+ },
15479
+ src: picUrl
15480
+ });
15481
+ }
15482
+ }, {
15483
+ dataIndex: 'goodShortName',
15484
+ title: "\u8D27\u54C1\u522B\u540D",
15485
+ align: 'center',
15486
+ ellipsis: true,
15487
+ width: 150,
15488
+ render: renderTextEllipsis
15489
+ }, {
15490
+ dataIndex: 'specBarcode',
15362
15491
  title: "\u8D27\u54C1\u6761\u7801",
15363
15492
  align: 'center',
15364
15493
  ellipsis: true,
15365
15494
  width: 150,
15366
15495
  render: renderTextEllipsis
15496
+ }, {
15497
+ dataIndex: 'categoryName',
15498
+ title: "\u8D27\u54C1\u7C7B\u522B",
15499
+ align: 'center',
15500
+ ellipsis: true,
15501
+ width: 150,
15502
+ render: renderTextEllipsis
15503
+ }, {
15504
+ dataIndex: 'brandName',
15505
+ title: "\u54C1\u724C",
15506
+ align: 'center',
15507
+ ellipsis: true,
15508
+ width: 200,
15509
+ render: renderTextEllipsis
15367
15510
  }, {
15368
15511
  dataIndex: 'specName',
15369
15512
  title: "\u89C4\u683C\u540D\u79F0",
@@ -15379,7 +15522,14 @@ var jkyColumns = [{
15379
15522
  width: 150,
15380
15523
  render: renderTextEllipsis
15381
15524
  }, {
15382
- dataIndex: 'skuImgUrl',
15525
+ dataIndex: 'specNo',
15526
+ title: "\u89C4\u683C\u7F16\u7801",
15527
+ align: 'center',
15528
+ ellipsis: true,
15529
+ width: 150,
15530
+ render: renderTextEllipsis
15531
+ }, {
15532
+ dataIndex: 'specImgUrl',
15383
15533
  title: "\u89C4\u683C\u56FE\u7247",
15384
15534
  align: 'center',
15385
15535
  ellipsis: true,
@@ -15395,162 +15545,78 @@ var jkyColumns = [{
15395
15545
  });
15396
15546
  }
15397
15547
  }, {
15398
- dataIndex: 'sellCount',
15399
- title: "\u6570\u91CF",
15400
- width: 100,
15401
- render: function render(val) {
15402
- return /*#__PURE__*/React__default['default'].createElement("span", null, val);
15403
- }
15404
- }, {
15405
- dataIndex: 'actualSendCount',
15406
- title: "\u5B9E\u53D1\u6570\u91CF",
15407
- width: 150,
15408
- render: renderTextEllipsis
15409
- }, {
15410
- dataIndex: 'sellPrice',
15411
- title: "\u5355\u4EF7",
15412
- width: 150,
15413
- render: function render(val) {
15414
- return val || val === 0 ? Number(val).toFixed(2) : '';
15415
- }
15416
- }, {
15417
- dataIndex: 'sellTotal',
15418
- title: "\u91D1\u989D",
15419
- width: 150
15420
- }, {
15421
- dataIndex: 'discountTotal',
15422
- title: "\u62B5\u6263\u91D1\u989D",
15423
- width: 150
15424
- }, {
15425
- dataIndex: 'shareFavourableFee',
15426
- title: "\u5206\u644A\u91D1\u989D",
15427
- width: 150
15428
- }, {
15429
- dataIndex: 'shareFavourableAfterFee',
15430
- title: "\u5206\u644A\u540E\u91D1\u989D",
15431
- width: 150
15432
- }, {
15433
- dataIndex: 'customerPrice',
15434
- title: "\u7EC8\u7AEF\u9500\u552E\u5355\u4EF7",
15435
- width: 150
15436
- }, {
15437
- dataIndex: 'customerTotal',
15438
- title: "\u7EC8\u7AEF\u9500\u552E\u91D1\u989D",
15439
- width: 150
15440
- }, {
15441
- dataIndex: 'divideSellTotal',
15442
- title: "\u5B9E\u4ED8\u91D1\u989D",
15443
- width: 150
15444
- }, {
15445
- dataIndex: 'isGift',
15446
- title: "\u662F\u5426\u8D60\u54C1",
15447
- width: 150,
15448
- render: function render(val) {
15449
- return /*#__PURE__*/React__default['default'].createElement("span", null, val === '1' ? '是' : '否');
15450
- }
15451
- }, {
15452
- dataIndex: 'isFit',
15453
- title: "\u662F\u5426\u7EC4\u5408\u88C5",
15454
- width: 150,
15455
- render: function render(val) {
15456
- return /*#__PURE__*/React__default['default'].createElement("span", null, val === '1' ? '是' : '否');
15457
- }
15458
- }, {
15459
- dataIndex: 'isPresell',
15460
- title: "\u662F\u5426\u9884\u552E\u8D27\u54C1",
15461
- width: 150,
15462
- render: function render(val) {
15463
- return /*#__PURE__*/React__default['default'].createElement("span", null, val === '1' ? '是' : '否');
15464
- }
15465
- }, {
15466
- dataIndex: 'brandName',
15467
- title: "\u54C1\u724C",
15548
+ dataIndex: 'colorName',
15549
+ title: "\u989C\u8272\u540D\u79F0",
15468
15550
  align: 'center',
15469
15551
  ellipsis: true,
15470
- width: 200,
15552
+ width: 150,
15471
15553
  render: renderTextEllipsis
15472
15554
  }, {
15473
- dataIndex: 'cateName',
15474
- title: "\u8D27\u54C1\u7C7B\u522B",
15555
+ dataIndex: 'colorCode',
15556
+ title: "\u989C\u8272\u4EE3\u7801",
15475
15557
  align: 'center',
15476
15558
  ellipsis: true,
15477
15559
  width: 150,
15478
15560
  render: renderTextEllipsis
15479
15561
  }, {
15480
- dataIndex: 'goodsTags',
15481
- title: "\u8D27\u54C1\u6807\u7B7E",
15562
+ dataIndex: 'sizeName',
15563
+ title: "\u5C3A\u7801\u540D\u79F0",
15482
15564
  align: 'center',
15483
15565
  ellipsis: true,
15484
- width: 250,
15566
+ width: 150,
15485
15567
  render: renderTextEllipsis
15486
15568
  }, {
15487
- dataIndex: 'goodsMemo',
15488
- title: "\u8D27\u54C1\u5907\u6CE8",
15569
+ dataIndex: 'sizeCode',
15570
+ title: "\u5C3A\u7801\u4EE3\u7801",
15489
15571
  align: 'center',
15490
15572
  ellipsis: true,
15491
- width: 250,
15573
+ width: 150,
15492
15574
  render: renderTextEllipsis
15493
15575
  }, {
15494
- dataIndex: 'tradeGoodsNo',
15495
- title: "\u4EA4\u6613\u8D27\u54C1\u7F16\u53F7",
15576
+ dataIndex: 'marketPrice',
15577
+ title: "\u5E02\u573A\u4EF7",
15496
15578
  align: 'center',
15497
15579
  ellipsis: true,
15498
- width: 250,
15499
- render: renderTextEllipsis
15500
- }, {
15501
- dataIndex: 'tradeGoodsName',
15502
- title: "\u4EA4\u6613\u8D27\u54C1\u540D\u79F0",
15503
- ellipsis: true,
15504
- width: 250,
15505
- render: renderTextEllipsis
15506
- }, {
15507
- dataIndex: 'tradeGoodsSpec',
15508
- title: "\u4EA4\u6613\u89C4\u683C\u540D\u79F0",
15509
- ellipsis: true,
15510
- width: 250,
15511
- render: renderTextEllipsis
15512
- }, {
15513
- dataIndex: 'sourceSubtradeNo',
15514
- title: "\u7F51\u5E97\u5B50\u8BA2\u5355\u53F7",
15515
- ellipsis: true,
15516
- width: 250,
15517
- render: renderTextEllipsis
15518
- }, {
15519
- dataIndex: 'platGoodsId',
15520
- title: "\u5E73\u53F0\u5546\u54C1ID",
15521
- ellipsis: true,
15522
- width: 250,
15580
+ width: 150,
15523
15581
  render: renderTextEllipsis
15524
15582
  }, {
15525
- dataIndex: 'subTradeId',
15526
- title: "\u5546\u54C1\u660E\u7EC6ID",
15583
+ dataIndex: 'retailPrice',
15584
+ title: "\u96F6\u552E\u4EF7",
15585
+ align: 'center',
15527
15586
  ellipsis: true,
15528
- width: 250,
15587
+ width: 150,
15529
15588
  render: renderTextEllipsis
15530
15589
  }, {
15531
- dataIndex: 'batchNo',
15532
- title: "\u6279\u6B21\u53F7",
15590
+ dataIndex: 'memberPrice',
15591
+ title: "\u4F1A\u5458\u4EF7",
15592
+ align: 'center',
15533
15593
  ellipsis: true,
15534
- width: 250,
15594
+ width: 150,
15535
15595
  render: renderTextEllipsis
15536
15596
  }, {
15537
- dataIndex: 'sendCount',
15538
- title: "\u6279\u6B21\u6570\u91CF",
15597
+ dataIndex: 'costPrice',
15598
+ title: "\u6210\u672C\u4EF7",
15599
+ align: 'center',
15539
15600
  ellipsis: true,
15540
- width: 250,
15601
+ width: 150,
15541
15602
  render: renderTextEllipsis
15542
15603
  }, {
15543
- dataIndex: 'productDate',
15544
- title: "\u751F\u4EA7\u65E5\u671F",
15604
+ dataIndex: 'isVirtual',
15605
+ title: "\u662F\u5426\u865A\u62DF\u5546\u54C1",
15606
+ align: 'center',
15545
15607
  ellipsis: true,
15546
- width: 250,
15547
- render: renderTextEllipsis
15608
+ width: 150,
15609
+ render: function render(val) {
15610
+ return renderTextEllipsis(getYesOrNo$2(val));
15611
+ }
15548
15612
  }, {
15549
- dataIndex: 'expireDate',
15550
- title: "\u5230\u671F\u65E5\u671F",
15613
+ dataIndex: 'skuType',
15614
+ title: "\u662F\u5426\u7EC4\u5408\u88C5",
15551
15615
  ellipsis: true,
15552
- width: 250,
15553
- render: renderTextEllipsis
15616
+ width: 150,
15617
+ render: function render(val) {
15618
+ return renderTextEllipsis(getYesOrNo$2(val === 'combine'));
15619
+ }
15554
15620
  }];
15555
15621
 
15556
15622
  var getColumnsMap = function getColumnsMap() {
@@ -15824,7 +15890,7 @@ var transformFormData = function transformFormData(formData) {
15824
15890
  if (formData[key]) {
15825
15891
  var _formData$key, _formData$key2, _formData$key3, _formData$key4;
15826
15892
  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];
15827
- 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 : 'like';
15893
+ 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';
15828
15894
  conditionList.push({
15829
15895
  leftValue: key,
15830
15896
  compareSymbol: compareSymbol,
@@ -15970,6 +16036,24 @@ var GoodList = function GoodList(props, ref) {
15970
16036
  };
15971
16037
  })
15972
16038
  }
16039
+ }, {
16040
+ label: '是否组合装',
16041
+ name: 'skuType',
16042
+ dataIndex: 'skuType',
16043
+ type: 'select',
16044
+ formItemProps: {
16045
+ mode: 'multiple',
16046
+ filterOption: function filterOption(input, option) {
16047
+ return option.label.includes(input);
16048
+ },
16049
+ options: [{
16050
+ label: '组合装',
16051
+ value: 'suite'
16052
+ }, {
16053
+ label: '非组合装',
16054
+ value: ''
16055
+ }]
16056
+ }
15973
16057
  }];
15974
16058
  var rowSelection = {
15975
16059
  selectedRowKeys: selectIds,
@@ -18793,13 +18877,15 @@ var JyGoodsModal$1 = /*#__PURE__*/React.forwardRef(JyGoodsModal);
18793
18877
  var getTableData$6 = function getTableData(_ref, formData) {
18794
18878
  var current = _ref.current,
18795
18879
  pageSize = _ref.pageSize;
18880
+ var conditionList = transformFormData(formData);
18796
18881
  return extendRequest('/qy/gdfw/product/product/page', {
18797
18882
  method: 'post',
18798
- data: _objectSpread2({
18883
+ data: {
18799
18884
  pageSize: pageSize,
18800
18885
  pageNo: current,
18801
- platform: 'JY_ERP'
18802
- }, formData)
18886
+ platform: 'JKY_ERP',
18887
+ conditionList: conditionList
18888
+ }
18803
18889
  }).then(function (res) {
18804
18890
  var _res$data = res.data,
18805
18891
  _res$data$productSkuL = _res$data.productSkuList,
@@ -18822,13 +18908,15 @@ var searchFormData$5 = [{
18822
18908
  }, {
18823
18909
  label: '规格编码',
18824
18910
  name: 'skuCode',
18825
- dataIndex: 'specNo'
18911
+ dataIndex: 'specNo',
18912
+ type: 'optionalInput'
18826
18913
  }, {
18827
- label: '商品名称',
18914
+ label: '货品名称',
18828
18915
  name: 'goodName'
18829
18916
  }, {
18830
- label: '商品编码',
18831
- name: 'goodNo'
18917
+ label: '货品编码',
18918
+ name: 'goodNo',
18919
+ type: 'optionalInput'
18832
18920
  }];
18833
18921
  var GoodList$6 = function GoodList(props, ref) {
18834
18922
  var _useState = React.useState([]),
@@ -18898,8 +18986,8 @@ var GoodList$6 = function GoodList(props, ref) {
18898
18986
  getCheckboxProps: function getCheckboxProps(record) {
18899
18987
  var options = {
18900
18988
  disabled: (props.selectedRows || []).map(function (row) {
18901
- return row.id || row.specId;
18902
- }).includes(record.id || record.specId),
18989
+ return row.specId || record.id;
18990
+ }).includes(record.specId || record.id),
18903
18991
  name: record.id
18904
18992
  };
18905
18993
  return options;
@@ -20346,7 +20434,7 @@ var getColumns$2 = function getColumns(_ref) {
20346
20434
  };
20347
20435
  };
20348
20436
 
20349
- var getYesOrNo$2 = function getYesOrNo(val) {
20437
+ var getYesOrNo$3 = function getYesOrNo(val) {
20350
20438
  if (kmkfUtils.isNull(val)) return null;
20351
20439
  return val ? '是' : '否';
20352
20440
  };
@@ -20497,7 +20585,7 @@ var getColumns$3 = function getColumns(_ref) {
20497
20585
  label: '否',
20498
20586
  value: false
20499
20587
  }]
20500
- }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$2(val));
20588
+ }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$3(val));
20501
20589
  },
20502
20590
  width: 100
20503
20591
  }]
@@ -20509,7 +20597,7 @@ var isNumberOrNumberString$1 = function isNumberOrNumberString(value) {
20509
20597
  if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
20510
20598
  return false;
20511
20599
  };
20512
- var getYesOrNo$3 = function getYesOrNo(val) {
20600
+ var getYesOrNo$4 = function getYesOrNo(val) {
20513
20601
  if (kmkfUtils.isNull(val)) return null;
20514
20602
  return val ? '是' : '否';
20515
20603
  };
@@ -20624,7 +20712,7 @@ var getColumns$4 = function getColumns(_ref) {
20624
20712
  title: "\u662F\u5426\u53D6\u6D88",
20625
20713
  width: 150,
20626
20714
  render: function render(val) {
20627
- return /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$3(val));
20715
+ return /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$4(val));
20628
20716
  }
20629
20717
  }, {
20630
20718
  dataIndex: 'isGift',
@@ -20643,7 +20731,7 @@ var getColumns$4 = function getColumns(_ref) {
20643
20731
  label: '否',
20644
20732
  value: 0
20645
20733
  }]
20646
- }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$3(val));
20734
+ }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$4(val));
20647
20735
  }
20648
20736
  }, {
20649
20737
  dataIndex: 'skuNote',
@@ -20769,7 +20857,7 @@ var getColumns$4 = function getColumns(_ref) {
20769
20857
  label: '否',
20770
20858
  value: 0
20771
20859
  }]
20772
- }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$3(val));
20860
+ }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$4(val));
20773
20861
  }
20774
20862
  }].map(function (item) {
20775
20863
  return _objectSpread2(_objectSpread2({}, item), {}, {
@@ -20898,7 +20986,7 @@ var getColumns$4 = function getColumns(_ref) {
20898
20986
  label: '否',
20899
20987
  value: 0
20900
20988
  }]
20901
- }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$3(val));
20989
+ }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$4(val));
20902
20990
  }
20903
20991
  }].map(function (item) {
20904
20992
  return _objectSpread2(_objectSpread2({}, item), {}, {
@@ -21754,6 +21842,11 @@ var getColumns$6 = function getColumns(_ref) {
21754
21842
  title: "\u4F9B\u5E94\u5546\u7F16\u7801",
21755
21843
  width: 150,
21756
21844
  render: renderTextEllipsis
21845
+ }, {
21846
+ dataIndex: 'remark',
21847
+ title: "\u5907\u6CE8",
21848
+ width: 200,
21849
+ render: renderTextEllipsis
21757
21850
  }].map(function (item) {
21758
21851
  return _objectSpread2(_objectSpread2({}, item), {}, {
21759
21852
  align: 'center',
@@ -22538,7 +22631,7 @@ var getColumns$9 = function getColumns(_ref) {
22538
22631
  }
22539
22632
  }, {
22540
22633
  dataIndex: 'sellTotal',
22541
- title: "\u91D1\u989D",
22634
+ title: "\u603B\u91D1\u989D",
22542
22635
  width: 150
22543
22636
  }, {
22544
22637
  dataIndex: 'discountTotal',
@@ -22563,7 +22656,22 @@ var getColumns$9 = function getColumns(_ref) {
22563
22656
  }, {
22564
22657
  dataIndex: 'divideSellTotal',
22565
22658
  title: "\u5B9E\u4ED8\u91D1\u989D",
22566
- width: 150
22659
+ width: 150,
22660
+ render: function render(val, record, index) {
22661
+ return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
22662
+ style: {
22663
+ width: 130
22664
+ },
22665
+ value: val,
22666
+ min: 0,
22667
+ precision: 2,
22668
+ onChange: function onChange(num) {
22669
+ updateDataHandle({
22670
+ divideSellTotal: num
22671
+ }, index);
22672
+ }
22673
+ }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
22674
+ }
22567
22675
  }, {
22568
22676
  dataIndex: 'isGift',
22569
22677
  title: "\u662F\u5426\u8D60\u54C1",
@@ -22582,12 +22690,12 @@ var getColumns$9 = function getColumns(_ref) {
22582
22690
  },
22583
22691
  options: [{
22584
22692
  label: '是',
22585
- value: '1'
22693
+ value: 1
22586
22694
  }, {
22587
22695
  label: '否',
22588
- value: '0'
22696
+ value: 0
22589
22697
  }]
22590
- }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === '1' ? '是' : '否');
22698
+ }) : /*#__PURE__*/React__default['default'].createElement("span", null, val == 1 ? '是' : '否');
22591
22699
  }
22592
22700
  }, {
22593
22701
  dataIndex: 'isFit',
@@ -22607,12 +22715,12 @@ var getColumns$9 = function getColumns(_ref) {
22607
22715
  },
22608
22716
  options: [{
22609
22717
  label: '是',
22610
- value: '1'
22718
+ value: 1
22611
22719
  }, {
22612
22720
  label: '否',
22613
- value: '0'
22721
+ value: 0
22614
22722
  }]
22615
- }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === '1' ? '是' : '否');
22723
+ }) : /*#__PURE__*/React__default['default'].createElement("span", null, val == 1 ? '是' : '否');
22616
22724
  }
22617
22725
  }, {
22618
22726
  dataIndex: 'isPresell',
@@ -22637,7 +22745,7 @@ var getColumns$9 = function getColumns(_ref) {
22637
22745
  label: '否',
22638
22746
  value: '0'
22639
22747
  }]
22640
- }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === '1' ? '是' : '否');
22748
+ }) : /*#__PURE__*/React__default['default'].createElement("span", null, val == '1' ? '是' : '否');
22641
22749
  }
22642
22750
  }, {
22643
22751
  dataIndex: 'brandName',
@@ -22856,8 +22964,8 @@ var getColumns$9 = function getColumns(_ref) {
22856
22964
  width: 250,
22857
22965
  render: function render(val, record, index) {
22858
22966
  return !disabled ? /*#__PURE__*/React__default['default'].createElement(ApaasInput, {
22859
- onChange: function onChange(value) {
22860
- updateHandle(value, index, 'reason');
22967
+ onChange: function onChange(e) {
22968
+ updateHandle(e.target.value, index, 'reason');
22861
22969
  }
22862
22970
  }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
22863
22971
  }
@@ -22873,12 +22981,12 @@ var getColumns$9 = function getColumns(_ref) {
22873
22981
  },
22874
22982
  options: [{
22875
22983
  label: '是',
22876
- value: '1'
22984
+ value: 1
22877
22985
  }, {
22878
22986
  label: '否',
22879
- value: '0'
22987
+ value: 0
22880
22988
  }]
22881
- }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === '1' ? '是' : '否');
22989
+ }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === 1 ? '是' : '否');
22882
22990
  }
22883
22991
  }, {
22884
22992
  dataIndex: 'isFit',
@@ -22892,12 +23000,12 @@ var getColumns$9 = function getColumns(_ref) {
22892
23000
  },
22893
23001
  options: [{
22894
23002
  label: '是',
22895
- value: 'True'
23003
+ value: 1
22896
23004
  }, {
22897
23005
  label: '否',
22898
- value: 'False'
23006
+ value: 0
22899
23007
  }]
22900
- }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === 'True' ? '是' : '否');
23008
+ }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === 1 ? '是' : '否');
22901
23009
  }
22902
23010
  }, {
22903
23011
  dataIndex: 'brandName',
@@ -23281,6 +23389,13 @@ var processGoods$1 = function processGoods(_ref) {
23281
23389
  canUpdateNumber: canUpdateNumber,
23282
23390
  source: source
23283
23391
  });
23392
+ } else if (isErpType.isJky(type)) {
23393
+ newList = processJkyGoods$1({
23394
+ list: list,
23395
+ type: type,
23396
+ canUpdateNumber: canUpdateNumber,
23397
+ source: source
23398
+ });
23284
23399
  } else {
23285
23400
  newList = processDefaultGoods({
23286
23401
  list: list,
@@ -23329,11 +23444,45 @@ var processJyGoods = function processJyGoods(_ref2) {
23329
23444
  });
23330
23445
  });
23331
23446
  };
23332
- // 处理不同类型的商品数据
23333
- var processWdtGoods$1 = function processWdtGoods(_ref3) {
23447
+ var processJkyGoods$1 = function processJkyGoods(_ref3) {
23334
23448
  var list = _ref3.list,
23335
- type = _ref3.type,
23336
23449
  canUpdateNumber = _ref3.canUpdateNumber;
23450
+ return list.map(function (item) {
23451
+ var goodName = item.goodName,
23452
+ goodNo = item.goodNo,
23453
+ goodId = item.goodId,
23454
+ specBarcode = item.specBarcode,
23455
+ retailPrice = item.retailPrice,
23456
+ isGift = item.isGift,
23457
+ skuType = item.skuType,
23458
+ specImgUrl = item.specImgUrl,
23459
+ categoryName = item.categoryName;
23460
+ return _objectSpread2(_objectSpread2({}, item), {}, {
23461
+ cateName: categoryName,
23462
+ goodsName: goodName,
23463
+ goodsNo: goodNo,
23464
+ goodsId: goodId,
23465
+ barcode: specBarcode,
23466
+ skuImgUrl: specImgUrl,
23467
+ combinationName: goodName,
23468
+ combinationCode: goodNo,
23469
+ isGift: isGift ? 1 : 0,
23470
+ isFit: skuType === 'combine' ? 1 : 0,
23471
+ uuid: kmkfUtils.uuid(),
23472
+ canDelete: true,
23473
+ sellCount: 1,
23474
+ sellPrice: retailPrice,
23475
+ sellTotal: retailPrice ? (retailPrice * 1).toFixed(2) : '',
23476
+ canEdit: true,
23477
+ canUpdateNumber: canUpdateNumber
23478
+ });
23479
+ });
23480
+ };
23481
+ // 处理不同类型的商品数据
23482
+ var processWdtGoods$1 = function processWdtGoods(_ref4) {
23483
+ var list = _ref4.list,
23484
+ type = _ref4.type,
23485
+ canUpdateNumber = _ref4.canUpdateNumber;
23337
23486
  return list.map(function (item) {
23338
23487
  var processedItem = _objectSpread2(_objectSpread2({}, item), {}, {
23339
23488
  uuid: kmkfUtils.uuid(),
@@ -23351,9 +23500,9 @@ var processWdtGoods$1 = function processWdtGoods(_ref3) {
23351
23500
  return processedItem;
23352
23501
  });
23353
23502
  };
23354
- var processBsE3Goods$1 = function processBsE3Goods(_ref4) {
23355
- var list = _ref4.list,
23356
- canUpdateNumber = _ref4.canUpdateNumber;
23503
+ var processBsE3Goods$1 = function processBsE3Goods(_ref5) {
23504
+ var list = _ref5.list,
23505
+ canUpdateNumber = _ref5.canUpdateNumber;
23357
23506
  return list.map(function (item) {
23358
23507
  var specNo = item.specNo,
23359
23508
  specId = item.specId,
@@ -23388,9 +23537,9 @@ var processBsE3Goods$1 = function processBsE3Goods(_ref4) {
23388
23537
  });
23389
23538
  });
23390
23539
  };
23391
- var processGyGoods$1 = function processGyGoods(_ref5) {
23392
- var list = _ref5.list,
23393
- source = _ref5.source;
23540
+ var processGyGoods$1 = function processGyGoods(_ref6) {
23541
+ var list = _ref6.list,
23542
+ source = _ref6.source;
23394
23543
  var isFormWorkOrder = source === 'workOrder';
23395
23544
  return list.map(function (item) {
23396
23545
  var goodName = item.goodName,
@@ -23417,8 +23566,8 @@ var processGyGoods$1 = function processGyGoods(_ref5) {
23417
23566
  });
23418
23567
  });
23419
23568
  };
23420
- var processJstGoods$1 = function processJstGoods(_ref6) {
23421
- var list = _ref6.list;
23569
+ var processJstGoods$1 = function processJstGoods(_ref7) {
23570
+ var list = _ref7.list;
23422
23571
  return list.map(function (item) {
23423
23572
  return {
23424
23573
  name: item.goodName,
@@ -23436,9 +23585,9 @@ var processJstGoods$1 = function processJstGoods(_ref6) {
23436
23585
  };
23437
23586
  });
23438
23587
  };
23439
- var processKmGoods$1 = function processKmGoods(_ref7) {
23440
- var list = _ref7.list,
23441
- type = _ref7.type;
23588
+ var processKmGoods$1 = function processKmGoods(_ref8) {
23589
+ var list = _ref8.list,
23590
+ type = _ref8.type;
23442
23591
  var initParamsMap = {
23443
23592
  KM_GOODS: {
23444
23593
  num: 1
@@ -23457,7 +23606,9 @@ var processKmGoods$1 = function processKmGoods(_ref7) {
23457
23606
  sysOuterId: item.goodNo,
23458
23607
  outerId: item.goodNo,
23459
23608
  skuSysId: item.specId,
23609
+ sysSkuId: item.specId,
23460
23610
  itemSysId: item.goodId,
23611
+ sysItemId: item.goodId,
23461
23612
  sysPicPath: item.goodPicUrl,
23462
23613
  payment: null,
23463
23614
  price: item.retailPrice,
@@ -23468,9 +23619,9 @@ var processKmGoods$1 = function processKmGoods(_ref7) {
23468
23619
  }, initParamsMap[type] || {});
23469
23620
  });
23470
23621
  };
23471
- var processDefaultGoods = function processDefaultGoods(_ref8) {
23472
- var list = _ref8.list,
23473
- canUpdateNumber = _ref8.canUpdateNumber;
23622
+ var processDefaultGoods = function processDefaultGoods(_ref9) {
23623
+ var list = _ref9.list,
23624
+ canUpdateNumber = _ref9.canUpdateNumber;
23474
23625
  return list.map(function (item) {
23475
23626
  var goodsId = item.goodsId,
23476
23627
  name = item.name,
@@ -23576,7 +23727,7 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
23576
23727
  systemItemIds = dataSource === null || dataSource === void 0 ? void 0 : dataSource.filter(function (item) {
23577
23728
  return item === null || item === void 0 ? void 0 : item.sysItemId;
23578
23729
  }).map(function (item) {
23579
- 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);
23730
+ 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);
23580
23731
  });
23581
23732
  _context.next = 3;
23582
23733
  return kmkfUtils.servers.KM.getSupplierSingleton(systemItemIds);
@@ -23585,7 +23736,7 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
23585
23736
  dataSource === null || dataSource === void 0 ? void 0 : (_dataSource$filter = dataSource.filter(function (item) {
23586
23737
  return item === null || item === void 0 ? void 0 : item.sysItemId;
23587
23738
  })) === null || _dataSource$filter === void 0 ? void 0 : _dataSource$filter.forEach(function (item) {
23588
- 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);
23739
+ 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);
23589
23740
  var supplierInfo = supplierMap.get(key);
23590
23741
  item.supplierCode = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierCode;
23591
23742
  item.supplierName = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierName;
@@ -23743,6 +23894,7 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
23743
23894
  }
23744
23895
  }), /*#__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, ")")));
23745
23896
  };
23897
+ SelectTradeGoods.displayName = 'SelectTradeGoods';
23746
23898
  var getButtonText = function getButtonText() {
23747
23899
  var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
23748
23900
  if (['KM_GOODS', 'KM_REISSUE_GOODS'].includes(type)) {
@@ -25132,21 +25284,25 @@ var getJkyOrderListSingleton = function getJkyOrderListSingleton(orderNo) {
25132
25284
  extendRequest('/qy/gdfw/jky/erp/trade/fullInfo', {
25133
25285
  method: 'post',
25134
25286
  data: {
25135
- billNo: orderNo
25287
+ sourceTradeNos: orderNo
25136
25288
  }
25137
25289
  }).then(function (res) {
25138
25290
  if (res === null || res === void 0 ? void 0 : res.success) {
25139
- var _res$data, _res$data$tradeOrderD, _res$data3;
25140
- 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) {
25141
- var _filterJkyOrders, _res$data2;
25142
- 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) {
25291
+ var _res$data, _res$data2;
25292
+ if (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.length) {
25293
+ var _filterJkyOrders;
25294
+ 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) {
25143
25295
  return _objectSpread2(_objectSpread2({}, item), {}, {
25296
+ tradeFrom: kmkfUtils.JKY_ORDER_FROM_MAP[item.tradeFrom],
25144
25297
  tradeType: kmkfUtils.JKY_ORDER_TYPE_MAP[item.tradeType],
25145
- tradeStatus: kmkfUtils.JKY_ORDER_STATUS_MAP[item.tradeStatus]
25298
+ tradeStatus: kmkfUtils.JKY_ORDER_STATUS_MAP[item.tradeStatus],
25299
+ logisticName: kmkfUtils.getJkyLogisticInfo(item, 'logisticName'),
25300
+ logisticCode: kmkfUtils.getJkyLogisticInfo(item, 'logisticCode'),
25301
+ logisticNo: kmkfUtils.getJkyLogisticInfo(item, 'logisticNo')
25146
25302
  });
25147
25303
  });
25148
25304
  }
25149
- resolve(((_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.trades) || []);
25305
+ resolve(((_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.trades) || []);
25150
25306
  // 延迟10秒清除,保证订单的时效性
25151
25307
  setTimeout(function () {
25152
25308
  singletonMap$7.delete(orderNo);
@@ -25508,8 +25664,8 @@ var index$2 = (function (props) {
25508
25664
  while (1) switch (_context8.prev = _context8.next) {
25509
25665
  case 0:
25510
25666
  jyUtils.getJyOrderListSingleton(orderNo).then(function (data) {
25511
- var trades = ((data === null || data === void 0 ? void 0 : data.trades) || []).filter(function (item) {
25512
- return kmkfUtils.getIsPlatformCodesIncludeOrderNos(item.platformCode, orderNo);
25667
+ var trades = (data || []).filter(function (item) {
25668
+ return kmkfUtils.getIsPlatformCodesIncludeOrderNos(item.tradeId, orderNo);
25513
25669
  });
25514
25670
  _onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, valueRef.current || {}), {}, {
25515
25671
  orders: trades,
@@ -25539,12 +25695,9 @@ var index$2 = (function (props) {
25539
25695
  while (1) switch (_context9.prev = _context9.next) {
25540
25696
  case 0:
25541
25697
  jkyUtils.getJkyOrderListSingleton(orderNo).then(function (data) {
25542
- var trades = ((data === null || data === void 0 ? void 0 : data.trades) || []).filter(function (item) {
25543
- return kmkfUtils.getIsPlatformCodesIncludeOrderNos(item.platformCode, orderNo);
25544
- });
25545
25698
  _onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, valueRef.current || {}), {}, {
25546
- orders: trades,
25547
- showOrderInfo: trades
25699
+ orders: data || [],
25700
+ showOrderInfo: data || []
25548
25701
  }));
25549
25702
  });
25550
25703
  onceRef.current = false;
@@ -26521,8 +26674,8 @@ var processGyOrders = function processGyOrders(_ref4) {
26521
26674
  var processJyOrders = function processJyOrders(_ref5) {
26522
26675
  var data = _ref5.data,
26523
26676
  orderNo = _ref5.orderNo;
26524
- var trades = ((data === null || data === void 0 ? void 0 : data.trades) || []).filter(function (item) {
26525
- return kmkfUtils.getIsPlatformCodesIncludeOrderNos(item.platformCode, orderNo);
26677
+ var trades = (data || []).filter(function (item) {
26678
+ return kmkfUtils.getIsPlatformCodesIncludeOrderNos(item.tradeId, orderNo);
26526
26679
  });
26527
26680
  return trades;
26528
26681
  };
@@ -26847,7 +27000,7 @@ var CommonGoods = function CommonGoods(props) {
26847
27000
  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) {
26848
27001
  return item === null || item === void 0 ? void 0 : item.sysItemId;
26849
27002
  })) === null || _value$kmGoods$filter === void 0 ? void 0 : _value$kmGoods$filter.forEach(function (item) {
26850
- var key = item.sysSkuId == '-1' ? item.sysItemId : "".concat(item.sysItemId, "-").concat(item.sysSkuId);
27003
+ 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);
26851
27004
  map[key] = item;
26852
27005
  });
26853
27006
  }
@@ -26888,7 +27041,8 @@ var CommonGoods = function CommonGoods(props) {
26888
27041
  hasChange = false;
26889
27042
  currentValue = valueRef.current;
26890
27043
  kmGoods = currentValue === null || currentValue === void 0 ? void 0 : (_currentValue$kmGoods = currentValue.kmGoods) === null || _currentValue$kmGoods === void 0 ? void 0 : _currentValue$kmGoods.map(function (item) {
26891
- var supplierInfo = supplierMap.get(item.sysItemId);
27044
+ 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);
27045
+ var supplierInfo = supplierMap.get(key);
26892
27046
  var newSupplierCode = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierCode;
26893
27047
  var newSupplierName = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierName;
26894
27048
  // 如果供应商信息有变化，标记需要更新
@@ -27172,7 +27326,6 @@ var CommonGoods = function CommonGoods(props) {
27172
27326
  orderNo: value === null || value === void 0 ? void 0 : value.orderNo,
27173
27327
  type: compType
27174
27328
  });
27175
- console.log('getDataSourceAsync', list);
27176
27329
  onChange(_objectSpread2(_objectSpread2({}, valueRef.current), {}, {
27177
27330
  allOrders: list || []
27178
27331
  }));
@@ -27208,6 +27361,7 @@ var CommonGoods = function CommonGoods(props) {
27208
27361
  }
27209
27362
  }));
27210
27363
  };
27364
+ CommonGoods.displayName = 'CommonGoods';
27211
27365
 
27212
27366
  var componentMap$3 = {
27213
27367
  WDT_RETURN_GOODS: {
@@ -27871,14 +28025,14 @@ var typeMap$2 = {
27871
28025
  alwaysShowChooseErpGoodsBtn: true,
27872
28026
  orderTypeKey: 'orderType',
27873
28027
  oIdKey: 'tradeNo',
27874
- outerOiIdKey: '',
27875
- goodDetailsKey: 'subOrderDetails',
28028
+ outerOiIdKey: 'sourceSubtradeNo',
28029
+ goodDetailsKey: 'goodsDetail',
27876
28030
  isShowSelectTradeGoods: true,
27877
28031
  showModeBtn: true
27878
28032
  }
27879
28033
  };
27880
28034
  var PublicReissue = function PublicReissue(props) {
27881
- var _typeMap$type36, _typeMap$type42, _typeMap$type43, _typeMap$type44, _typeMap$type45, _value$typeMap$type$s8, _typeMap$type46, _typeMap$type47, _typeMap$type48, _typeMap$type49, _typeMap$type50, _typeMap$type51, _typeMap$type52, _typeMap$type53, _value$typeMap$type$s9, _typeMap$type54, _typeMap$type55, _typeMap$type56, _typeMap$type57;
28035
+ var _typeMap$type35, _typeMap$type41, _typeMap$type42, _typeMap$type43, _typeMap$type44, _value$typeMap$type$s8, _typeMap$type45, _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;
27882
28036
  var value = props.value,
27883
28037
  onChange = props.onChange,
27884
28038
  _props$reasonList = props.reasonList,
@@ -28001,7 +28155,7 @@ var PublicReissue = function PublicReissue(props) {
28001
28155
  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) {
28002
28156
  return item === null || item === void 0 ? void 0 : item.sysItemId;
28003
28157
  })) === null || _value$kmReissueGoods2 === void 0 ? void 0 : _value$kmReissueGoods2.forEach(function (item) {
28004
- var key = item.sysSkuId == '-1' ? item.sysItemId : "".concat(item.sysItemId, "-").concat(item.sysSkuId);
28158
+ 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);
28005
28159
  map[key] = item;
28006
28160
  });
28007
28161
  }
@@ -28042,7 +28196,8 @@ var PublicReissue = function PublicReissue(props) {
28042
28196
  hasChange = false;
28043
28197
  currentValue = valueRef.current;
28044
28198
  kmReissueGoods = currentValue === null || currentValue === void 0 ? void 0 : (_currentValue$kmReiss = currentValue.kmReissueGoods) === null || _currentValue$kmReiss === void 0 ? void 0 : _currentValue$kmReiss.map(function (item) {
28045
- var supplierInfo = supplierMap.get(item.sysItemId);
28199
+ 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);
28200
+ var supplierInfo = supplierMap.get(key);
28046
28201
  var newSupplierCode = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierCode;
28047
28202
  var newSupplierName = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierName;
28048
28203
  // 如果供应商信息有变化，标记需要更新
@@ -28078,7 +28233,7 @@ var PublicReissue = function PublicReissue(props) {
28078
28233
  }
28079
28234
  }, [sysItemIdMap]);
28080
28235
  var getGoodDetails = function getGoodDetails(_ref5) {
28081
- var _typeMap$type18, _typeMap$type19, _value$typeMap$type$s6, _typeMap$type20, _typeMap$type21, _typeMap$type22, _typeMap$type23, _typeMap$type24;
28236
+ var _typeMap$type18, _typeMap$type19, _value$typeMap$type$s6, _typeMap$type20, _typeMap$type21, _typeMap$type22, _typeMap$type23;
28082
28237
  var mode = _ref5.mode,
28083
28238
  sysOrderNo = _ref5.sysOrderNo,
28084
28239
  _ref5$isAllOrders = _ref5.isAllOrders,
@@ -28110,8 +28265,7 @@ var PublicReissue = function PublicReissue(props) {
28110
28265
  var _order$typeMap$type$g;
28111
28266
  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;
28112
28267
  });
28113
- console.log(type, orders, (_typeMap$type21 = typeMap$2[type]) === null || _typeMap$type21 === void 0 ? void 0 : _typeMap$type21.updateGoodsHandle(orders, orderRest));
28114
- 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) : [];
28268
+ var goodDetails = hasGoodDetails ? (!isAllOrders || ((_typeMap$type21 = typeMap$2[type]) === null || _typeMap$type21 === void 0 ? void 0 : _typeMap$type21.isSelectTradeGoodsMerge)) && typeMap$2[type].mergeIdenticalGoods ? typeMap$2[type].mergeIdenticalGoods((_typeMap$type22 = typeMap$2[type]) === null || _typeMap$type22 === void 0 ? void 0 : _typeMap$type22.updateGoodsHandle(orders, orderRest)) : (_typeMap$type23 = typeMap$2[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.updateGoodsHandle(orders, orderRest) : [];
28115
28269
  var orderNo = systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orderNo;
28116
28270
  var list = mode && !isAllOrders ? goodDetails.filter(function (goodItem) {
28117
28271
  return !orderNo || goodItem[typeMap$2[type].outerOiIdKey] === orderNo;
@@ -28119,30 +28273,30 @@ var PublicReissue = function PublicReissue(props) {
28119
28273
  return list;
28120
28274
  };
28121
28275
  var changeGoodHandle = function changeGoodHandle(val) {
28122
- var _typeMap$type25;
28276
+ var _typeMap$type24;
28123
28277
  var newValue = _objectSpread2({}, value);
28124
- newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type25 = typeMap$2[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.key)] = val || [];
28278
+ newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type24 = typeMap$2[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.key)] = val || [];
28125
28279
  onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
28126
28280
  };
28127
28281
  var changeSystemOrderHandle = function changeSystemOrderHandle(val) {
28128
- var _typeMap$type26, _typeMap$type27, _value$typeMap$type$t2, _typeMap$type32, _value$typeMap$type$t3, _typeMap$type34;
28282
+ var _typeMap$type25, _typeMap$type26, _value$typeMap$type$t2, _typeMap$type31, _value$typeMap$type$t3, _typeMap$type33;
28129
28283
  var newValue = _objectSpread2({}, value);
28130
- newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type26 = typeMap$2[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.systemOrderNo)] = val;
28131
- if (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type27 = typeMap$2[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.systemOrderBillType) {
28132
- var _value$typeMap$type$s7, _typeMap$type28, _typeMap$type30, _typeMap$type31;
28133
- var orders = (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s7 = value[(_typeMap$type28 = typeMap$2[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.systemOrder]) === null || _value$typeMap$type$s7 === void 0 ? void 0 : _value$typeMap$type$s7.orders) || [];
28284
+ newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type25 = typeMap$2[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.systemOrderNo)] = val;
28285
+ if (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type26 = typeMap$2[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.systemOrderBillType) {
28286
+ var _value$typeMap$type$s7, _typeMap$type27, _typeMap$type29, _typeMap$type30;
28287
+ var orders = (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s7 = value[(_typeMap$type27 = typeMap$2[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.systemOrder]) === null || _value$typeMap$type$s7 === void 0 ? void 0 : _value$typeMap$type$s7.orders) || [];
28134
28288
  var targetOrder = val && orders.find(function (oItem) {
28135
- var _typeMap$type29;
28136
- return oItem[(_typeMap$type29 = typeMap$2[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.oIdKey] === val;
28289
+ var _typeMap$type28;
28290
+ return oItem[(_typeMap$type28 = typeMap$2[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.oIdKey] === val;
28137
28291
  });
28138
- newValue[(_typeMap$type30 = typeMap$2[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.systemOrderBillType] = targetOrder === null || targetOrder === void 0 ? void 0 : targetOrder[(_typeMap$type31 = typeMap$2[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.orderTypeKey];
28139
- }
28140
- if (['2'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t2 = value[(_typeMap$type32 = typeMap$2[type]) === null || _typeMap$type32 === void 0 ? void 0 : _typeMap$type32.typeName]) === null || _value$typeMap$type$t2 === void 0 ? void 0 : _value$typeMap$type$t2[0])) {
28141
- var _typeMap$type33;
28142
- newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type33 = typeMap$2[type]) === null || _typeMap$type33 === void 0 ? void 0 : _typeMap$type33.key)] = [];
28143
- } else if (['1'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t3 = value[(_typeMap$type34 = typeMap$2[type]) === null || _typeMap$type34 === void 0 ? void 0 : _typeMap$type34.typeName]) === null || _value$typeMap$type$t3 === void 0 ? void 0 : _value$typeMap$type$t3[0])) {
28144
- var _typeMap$type35;
28145
- newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type35 = typeMap$2[type]) === null || _typeMap$type35 === void 0 ? void 0 : _typeMap$type35.key)] = getGoodDetails({
28292
+ newValue[(_typeMap$type29 = typeMap$2[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.systemOrderBillType] = targetOrder === null || targetOrder === void 0 ? void 0 : targetOrder[(_typeMap$type30 = typeMap$2[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.orderTypeKey];
28293
+ }
28294
+ if (['2'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t2 = value[(_typeMap$type31 = typeMap$2[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.typeName]) === null || _value$typeMap$type$t2 === void 0 ? void 0 : _value$typeMap$type$t2[0])) {
28295
+ var _typeMap$type32;
28296
+ newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type32 = typeMap$2[type]) === null || _typeMap$type32 === void 0 ? void 0 : _typeMap$type32.key)] = [];
28297
+ } else if (['1'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t3 = value[(_typeMap$type33 = typeMap$2[type]) === null || _typeMap$type33 === void 0 ? void 0 : _typeMap$type33.typeName]) === null || _value$typeMap$type$t3 === void 0 ? void 0 : _value$typeMap$type$t3[0])) {
28298
+ var _typeMap$type34;
28299
+ newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type34 = typeMap$2[type]) === null || _typeMap$type34 === void 0 ? void 0 : _typeMap$type34.key)] = getGoodDetails({
28146
28300
  mode: isStrict,
28147
28301
  sysOrderNo: val
28148
28302
  });
@@ -28150,27 +28304,27 @@ var PublicReissue = function PublicReissue(props) {
28150
28304
  onChange === null || onChange === void 0 ? void 0 : onChange(newValue, 'systemOrder');
28151
28305
  };
28152
28306
  //显示选择商品按钮
28153
- var showChangeBtn = !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type36 = typeMap$2[type]) === null || _typeMap$type36 === void 0 ? void 0 : _typeMap$type36.systemOrderNo]);
28307
+ var showChangeBtn = !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type35 = typeMap$2[type]) === null || _typeMap$type35 === void 0 ? void 0 : _typeMap$type35.systemOrderNo]);
28154
28308
  var selectedGoodsChange = React.useCallback(function (skuList) {
28155
- var _typeMap$type37, _typeMap$type38, _typeMap$type39, _uniqBy, _typeMap$type40;
28309
+ var _typeMap$type36, _typeMap$type37, _typeMap$type38, _uniqBy, _typeMap$type39;
28156
28310
  var newValue = _objectSpread2({}, value);
28157
28311
  // 原订单商品
28158
28312
  var originTradeGoodList = getGoodDetails({
28159
28313
  mode: isStrict,
28160
- isAllOrders: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type37 = typeMap$2[type]) === null || _typeMap$type37 === void 0 ? void 0 : _typeMap$type37.isShowSelectTradeGoods
28314
+ isAllOrders: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type36 = typeMap$2[type]) === null || _typeMap$type36 === void 0 ? void 0 : _typeMap$type36.isShowSelectTradeGoods
28161
28315
  }) || [];
28162
28316
  // 当前选中的所有商品【包含了原订单+商品库】
28163
- var currentSelectGoodList = (value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type38 = typeMap$2[type]) === null || _typeMap$type38 === void 0 ? void 0 : _typeMap$type38.key)]) || [];
28164
- newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type39 = typeMap$2[type]) === null || _typeMap$type39 === void 0 ? void 0 : _typeMap$type39.key)] = (_uniqBy = lodash.uniqBy(originTradeGoodList.concat(currentSelectGoodList), (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type40 = typeMap$2[type]) === null || _typeMap$type40 === void 0 ? void 0 : _typeMap$type40.uniqueKey) || 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
28165
- var _typeMap$type41;
28166
- return skuList.includes(item[(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type41 = typeMap$2[type]) === null || _typeMap$type41 === void 0 ? void 0 : _typeMap$type41.uniqueKey) || 'uuid']);
28317
+ var currentSelectGoodList = (value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type37 = typeMap$2[type]) === null || _typeMap$type37 === void 0 ? void 0 : _typeMap$type37.key)]) || [];
28318
+ newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type38 = typeMap$2[type]) === null || _typeMap$type38 === void 0 ? void 0 : _typeMap$type38.key)] = (_uniqBy = lodash.uniqBy(originTradeGoodList.concat(currentSelectGoodList), (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type39 = typeMap$2[type]) === null || _typeMap$type39 === void 0 ? void 0 : _typeMap$type39.uniqueKey) || 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
28319
+ var _typeMap$type40;
28320
+ return skuList.includes(item[(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type40 = typeMap$2[type]) === null || _typeMap$type40 === void 0 ? void 0 : _typeMap$type40.uniqueKey) || 'uuid']);
28167
28321
  });
28168
28322
  onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
28169
- }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type42 = typeMap$2[type]) === null || _typeMap$type42 === void 0 ? void 0 : _typeMap$type42.key)], isStrict]);
28323
+ }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type41 = typeMap$2[type]) === null || _typeMap$type41 === void 0 ? void 0 : _typeMap$type41.key)], isStrict]);
28170
28324
  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Row, {
28171
28325
  gutter: 8,
28172
28326
  wrap: true,
28173
- id: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type43 = typeMap$2[type]) === null || _typeMap$type43 === void 0 ? void 0 : _typeMap$type43.key) || "".concat(Date.now())
28327
+ id: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type42 = typeMap$2[type]) === null || _typeMap$type42 === void 0 ? void 0 : _typeMap$type42.key) || "".concat(Date.now())
28174
28328
  }, /*#__PURE__*/React__default['default'].createElement(antd.Col, {
28175
28329
  className: "gutter-row",
28176
28330
  xs: {
@@ -28186,12 +28340,12 @@ var PublicReissue = function PublicReissue(props) {
28186
28340
  },
28187
28341
  disabled: disabled,
28188
28342
  allowClear: false,
28189
- value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type44 = typeMap$2[type]) === null || _typeMap$type44 === void 0 ? void 0 : _typeMap$type44.systemOrderNo)],
28343
+ value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type43 = typeMap$2[type]) === null || _typeMap$type43 === void 0 ? void 0 : _typeMap$type43.systemOrderNo)],
28190
28344
  onChange: function onChange(val) {
28191
28345
  return changeSystemOrderHandle(val);
28192
28346
  },
28193
- placeholder: "\u9009\u62E9".concat((typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type45 = typeMap$2[type]) === null || _typeMap$type45 === void 0 ? void 0 : _typeMap$type45.compType) || '', "\u7CFB\u7EDF\u5355")
28194
- }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s8 = value[(_typeMap$type46 = typeMap$2[type]) === null || _typeMap$type46 === void 0 ? void 0 : _typeMap$type46.systemOrder]) === null || _value$typeMap$type$s8 === void 0 ? void 0 : _value$typeMap$type$s8.showOrderInfo) || []).map(function (item) {
28347
+ placeholder: "\u9009\u62E9".concat((typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type44 = typeMap$2[type]) === null || _typeMap$type44 === void 0 ? void 0 : _typeMap$type44.compType) || '', "\u7CFB\u7EDF\u5355")
28348
+ }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s8 = value[(_typeMap$type45 = typeMap$2[type]) === null || _typeMap$type45 === void 0 ? void 0 : _typeMap$type45.systemOrder]) === null || _value$typeMap$type$s8 === void 0 ? void 0 : _value$typeMap$type$s8.showOrderInfo) || []).map(function (item) {
28195
28349
  return /*#__PURE__*/React__default['default'].createElement(antd.Select.Option, {
28196
28350
  key: item[typeMap$2[type].oIdKey],
28197
28351
  value: item[typeMap$2[type].oIdKey],
@@ -28213,11 +28367,11 @@ var PublicReissue = function PublicReissue(props) {
28213
28367
  disabled: isSettingConfig ? !isSettingConfig : disabled,
28214
28368
  allowClear: false,
28215
28369
  options: reasonList,
28216
- value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type47 = typeMap$2[type]) === null || _typeMap$type47 === void 0 ? void 0 : _typeMap$type47.typeName)],
28370
+ value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type46 = typeMap$2[type]) === null || _typeMap$type46 === void 0 ? void 0 : _typeMap$type46.typeName)],
28217
28371
  onChange: function onChange(val) {
28218
28372
  return changeTypeHandle(val);
28219
28373
  }
28220
- })), (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type48 = typeMap$2[type]) === null || _typeMap$type48 === void 0 ? void 0 : _typeMap$type48.systemOrderBillType) && !isSettingConfig && /*#__PURE__*/React__default['default'].createElement(antd.Col, {
28374
+ })), (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type47 = typeMap$2[type]) === null || _typeMap$type47 === void 0 ? void 0 : _typeMap$type47.systemOrderBillType) && !isSettingConfig && /*#__PURE__*/React__default['default'].createElement(antd.Col, {
28221
28375
  className: "gutter-row",
28222
28376
  xs: {
28223
28377
  span: 11
@@ -28226,7 +28380,7 @@ var PublicReissue = function PublicReissue(props) {
28226
28380
  span: 6
28227
28381
  }
28228
28382
  }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
28229
- value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type49 = typeMap$2[type]) === null || _typeMap$type49 === void 0 ? void 0 : _typeMap$type49.systemOrderBillType)],
28383
+ value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type48 = typeMap$2[type]) === null || _typeMap$type48 === void 0 ? void 0 : _typeMap$type48.systemOrderBillType)],
28230
28384
  disabled: disabled,
28231
28385
  readOnly: true
28232
28386
  }))), /*#__PURE__*/React__default['default'].createElement(GoodItem$1, _objectSpread2(_objectSpread2({
@@ -28237,29 +28391,30 @@ var PublicReissue = function PublicReissue(props) {
28237
28391
  canUpdateNumber: showChangeBtn,
28238
28392
  hasSelectedSystemOrder: showChangeBtn,
28239
28393
  // showChangeBtn={showChangeBtn || typeMap?.[type]?.isShowSelectTradeGoods}
28240
- 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,
28394
+ alwaysShowChooseErpGoodsBtn: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type49 = typeMap$2[type]) === null || _typeMap$type49 === void 0 ? void 0 : _typeMap$type49.alwaysShowChooseErpGoodsBtn,
28241
28395
  // showErpGoodsBtn={typeMap?.[type]?.showErpGoodsBtn}
28242
28396
  shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
28243
- 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)],
28397
+ value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type50 = typeMap$2[type]) === null || _typeMap$type50 === void 0 ? void 0 : _typeMap$type50.key)],
28244
28398
  onChange: function onChange(val) {
28245
28399
  return changeGoodHandle(val);
28246
28400
  },
28247
28401
  onModeChange: handleModeChange,
28248
- showModeBtn: !!(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type52 = typeMap$2[type]) === null || _typeMap$type52 === void 0 ? void 0 : _typeMap$type52.showModeBtn),
28402
+ showModeBtn: !!(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type51 = typeMap$2[type]) === null || _typeMap$type51 === void 0 ? void 0 : _typeMap$type51.showModeBtn),
28249
28403
  isStrict: isStrict,
28250
- isShowSelectTradeGoods: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type53 = typeMap$2[type]) === null || _typeMap$type53 === void 0 ? void 0 : _typeMap$type53.isShowSelectTradeGoods,
28251
- systemOrders: value === null || value === void 0 ? void 0 : (_value$typeMap$type$s9 = value[(_typeMap$type54 = typeMap$2[type]) === null || _typeMap$type54 === void 0 ? void 0 : _typeMap$type54.systemOrder]) === null || _value$typeMap$type$s9 === void 0 ? void 0 : _value$typeMap$type$s9.orders,
28252
- selectedSystemOrders: showChangeBtn ? [value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type55 = typeMap$2[type]) === null || _typeMap$type55 === void 0 ? void 0 : _typeMap$type55.systemOrderNo)]] : [],
28404
+ 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,
28405
+ 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,
28406
+ 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)]] : [],
28253
28407
  tradeGoods: {
28254
28408
  originDataSource: getGoodDetails({
28255
28409
  mode: isStrict,
28256
- isAllOrders: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type56 = typeMap$2[type]) === null || _typeMap$type56 === void 0 ? void 0 : _typeMap$type56.isShowSelectTradeGoods
28410
+ 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
28257
28411
  }),
28258
- uniqueKey: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type57 = typeMap$2[type]) === null || _typeMap$type57 === void 0 ? void 0 : _typeMap$type57.uniqueKey) || 'uuid',
28412
+ 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',
28259
28413
  selectedGoodsChange: selectedGoodsChange
28260
28414
  }
28261
28415
  })));
28262
28416
  };
28417
+ PublicReissue.displayName = 'PublicReissue';
28263
28418
 
28264
28419
  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";
28265
28420
  styleInject(css_248z$g);