@kmkf-fe-packages/basic-components 1.22.1-beta.0 → 1.22.1-beta.10

package/dist/index.esm.js

@@ -4,7 +4,7 @@ import { EyeOutlined, DeleteOutlined, CloseCircleOutlined, CaretUpOutlined } fro
 import request, { extend as extend$1 } from 'umi-request';
 import { CopyToClipboard } from 'react-copy-to-clipboard';
 import { AddressData, BsAddressData, WdtAddressData, request as request$1, ExpressData, uuid, LogisticsAddressData, SendDataCenter, BS_E3_BOOLEAN_STATUS_MAP, filterWdtOrders, WDT_ORDER_TYPE_MAP, filterBsE3Orders, filterKmOrders, KM_SYSTEM_ORDER_CONFIG, BS_E3_ORDER_STATUS_MAP, updateWdtGoodsHandle, updateBsE3GoodsHandle } from '@kmkf-fe-packages/kmkf-utils';
-import { debounce, isNaN as isNaN$1, isNumber as isNumber$1, cloneDeep, difference, differenceWith, takeRight, reject, isEmpty } from 'lodash';
+import { debounce, isNaN as isNaN$1, isNumber as isNumber$1, cloneDeep, difference, differenceWith, takeRight, reject, isEmpty, intersection } from 'lodash';
 import { useUpdateEffect, useDebounceEffect, useAntdTable } from 'ahooks';
 import zhCN from 'antd/lib/locale/zh_CN';
 import pubsub from 'pubsub-js';
@@ -12576,6 +12576,104 @@ var getBsE3ReissueGoodColumns = function getBsE3ReissueGoodColumns(_ref4) {
   });
 };
 
+var columns$4 = [{
+  dataIndex: 'goodId',
+  title: "\u5546\u54C1ID",
+  width: 70
+}, {
+  dataIndex: 'goodNo',
+  title: "\u5546\u54C1\u7F16\u7801",
+  width: 180
+}, {
+  dataIndex: 'goodName',
+  title: "\u5546\u54C1\u540D\u79F0",
+  width: 250
+}, {
+  dataIndex: 'specId',
+  title: "SKUID",
+  width: 100
+}, {
+  dataIndex: 'specNo',
+  title: "\u5546\u54C1SKU\u7F16\u7801",
+  width: 180
+}, {
+  dataIndex: 'specName',
+  title: "\u5546\u54C1SKU\u540D\u79F0",
+  width: 250
+}, {
+  dataIndex: 'orderPrice',
+  title: "\u5B9E\u4ED8\u603B\u91D1\u989D",
+  width: 100
+}, {
+  dataIndex: 'num',
+  title: "\u6570\u91CF",
+  width: 100
+}, {
+  dataIndex: 'sharePrice',
+  title: "\u5206\u644A\u4EF7",
+  width: 70
+}, {
+  dataIndex: 'giftType',
+  title: "\u8D60\u54C1\u65B9\u5F0F",
+  width: 100
+}];
+var renderFieldMap$1 = {
+  num: function num(_ref) {
+    var disabled = _ref.disabled,
+      updateHandle = _ref.updateHandle;
+    return function (val, record, index) {
+      return !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
+        style: {
+          width: 70
+        },
+        value: val,
+        min: 1,
+        precision: 0,
+        onChange: function onChange(num) {
+          return updateHandle(num, index, 'num');
+        }
+      }) : /*#__PURE__*/React.createElement("span", null, val);
+    };
+  },
+  giftType: function giftType(_ref2) {
+    var disabled = _ref2.disabled,
+      updateHandle = _ref2.updateHandle;
+    return function (val) {
+      var giftTypeMap = {
+        0: '非赠品',
+        1: '自动赠送',
+        2: '手工赠送',
+        3: '回购自动送赠品',
+        4: '前N有礼送赠品',
+        6: '天猫优仓赠品',
+        7: '淘宝CRM会员送赠'
+      };
+      return /*#__PURE__*/React.createElement("span", null, giftTypeMap[val]);
+    };
+  }
+};
+var getWdtReissueGoodColumns = function getWdtReissueGoodColumns(_ref3) {
+  var disabled = _ref3.disabled,
+    updateHandle = _ref3.updateHandle,
+    operate = _ref3.operate;
+  return columns$4.map(function (item) {
+    var newItem = _objectSpread2({
+      align: 'center',
+      ellipsis: true
+    }, item);
+    if (operate && (renderFieldMap$1 === null || renderFieldMap$1 === void 0 ? void 0 : renderFieldMap$1[item.dataIndex])) {
+      return _objectSpread2(_objectSpread2({}, newItem), {}, {
+        render: renderFieldMap$1 === null || renderFieldMap$1 === void 0 ? void 0 : renderFieldMap$1[item.dataIndex]({
+          disabled: disabled,
+          updateHandle: updateHandle
+        })
+      });
+    }
+    return newItem;
+  });
+};
+
+var MAIN_FIELD = 'id';
 var SelectTradeGoods = function SelectTradeGoods(_ref) {
   var columns = _ref.columns,
     dataSource = _ref.dataSource,
@@ -12591,11 +12689,20 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
   var closeModal = function closeModal() {
     return setTradeGoodsVisible(false);
   };
+  var currentTradeOriginGoods = intersection(dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (item) {
+    return item === null || item === void 0 ? void 0 : item[MAIN_FIELD];
+  }), selectedRowKeys);
+  var unCurrentTradeOriginGoods = difference(selectedRowKeys, dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (item) {
+    return item === null || item === void 0 ? void 0 : item[MAIN_FIELD];
+  }));
+  var handleChangeSelectedKeys = function handleChangeSelectedKeys(keys) {
+    console.log('handleChangeSelectedKeys', keys, unCurrentTradeOriginGoods);
+    onChangeSelectedKeys(keys.concat(unCurrentTradeOriginGoods));
+  };
   var rowSelection = {
     selectedRowKeys: selectedRowKeys,
-    onChange: onChangeSelectedKeys
+    onChange: handleChangeSelectedKeys
   };
-  console.debug('选择订单商品-dataSource', dataSource, selectedRowKeys);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Button, {
     type: "link",
     onClick: openModal
@@ -12605,7 +12712,7 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     footer: null,
     onCancel: closeModal
   }, /*#__PURE__*/React.createElement(Table, {
-    rowKey: "id",
+    rowKey: MAIN_FIELD,
     rowSelection: rowSelection,
     columns: columns,
     dataSource: dataSource,
@@ -12614,7 +12721,17 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
       x: 500,
       y: 500
     }
-  }), /*#__PURE__*/React.createElement("span", null, "\u5DF2\u9009\u62E9(", selectedRowKeys === null || selectedRowKeys === void 0 ? void 0 : selectedRowKeys.length, "/", dataSource === null || dataSource === void 0 ? void 0 : dataSource.length, ")")));
+  }), /*#__PURE__*/React.createElement("span", null, "\u5DF2\u9009\u62E9(", currentTradeOriginGoods === null || currentTradeOriginGoods === void 0 ? void 0 : currentTradeOriginGoods.length, "/", dataSource === null || dataSource === void 0 ? void 0 : dataSource.length, ")")));
+};
+var getButtonText = function getButtonText() {
+  var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+  if (['BS_E3_GOODS', 'BS_E3_REISSUE_GOODS', 'BS_E3_EXCHANGE_GOODS'].includes(type)) {
+    return '选择百胜ERP商品';
+  }
+  if (['WDT_REISSUE_GOODS'].includes(type)) {
+    return '选择旺店通商品';
+  }
+  return '选择商品';
 };
 var GoodItem$1 = function GoodItem(props) {
   var _props$value = props.value,
@@ -12671,7 +12788,7 @@ var GoodItem$1 = function GoodItem(props) {
   // TODO: 商品订单中以选中商品
   var selectedGoods = useMemo(function () {
     return value === null || value === void 0 ? void 0 : value.map(function (v) {
-      return v.id;
+      return v === null || v === void 0 ? void 0 : v[MAIN_FIELD];
     });
   }, [value]);
   var updateHandle = function updateHandle(val, index, columnType) {
@@ -12712,6 +12829,14 @@ var GoodItem$1 = function GoodItem(props) {
       var columns = [];
       switch (type) {
         case 'WDT_REISSUE_GOODS':
+          {
+            columns = getWdtReissueGoodColumns({
+              disabled: disabled,
+              updateHandle: updateHandle,
+              operate: operate
+            });
+          }
+          break;
         case 'WDT_GOODS':
           columns = [{
             dataIndex: 'goodId',
@@ -13217,6 +13342,116 @@ var GoodItem$1 = function GoodItem(props) {
             });
           }
           break;
+        case 'BS_GOODS':
+          columns = [{
+            dataIndex: 'mark',
+            title: "\u5546\u54C1\u6807\u8BB0",
+            align: 'center',
+            ellipsis: true,
+            width: 70,
+            render: function render(val, record, index) {
+              return /*#__PURE__*/React.createElement(Select, {
+                options: [{
+                  label: '是',
+                  value: '是'
+                }, {
+                  label: '否',
+                  value: '否'
+                }],
+                disabled: disabled,
+                value: val,
+                onChange: function onChange(val) {
+                  return updateHandle(val, index, 'mark');
+                }
+              });
+            }
+          }, {
+            dataIndex: 'skuName',
+            title: "".concat(text, "sku\u540D\u79F0"),
+            align: 'center',
+            ellipsis: true,
+            width: 250
+          }, {
+            dataIndex: 'sku',
+            title: "".concat(text, "sku\u7F16\u7801"),
+            align: 'center',
+            ellipsis: true,
+            width: 100
+          }, {
+            dataIndex: 'name',
+            title: "".concat(text, "\u540D\u79F0"),
+            align: 'center',
+            ellipsis: true,
+            width: 250
+          }, {
+            dataIndex: 'pic',
+            title: "\u56FE\u7247",
+            align: 'center',
+            ellipsis: true,
+            width: 100,
+            render: function render(val) {
+              return /*#__PURE__*/React.createElement(Image, {
+                width: 60,
+                src: val
+              });
+            }
+          }, {
+            dataIndex: 'code',
+            title: "".concat(text, "\u7F16\u7801"),
+            align: 'center',
+            ellipsis: true,
+            width: 100
+          }, {
+            dataIndex: 'money',
+            title: "\u5B9E\u4ED8\u91D1\u989D",
+            align: 'center',
+            ellipsis: true,
+            width: 100
+          }, {
+            dataIndex: 'number',
+            title: "".concat(text, "\u6570\u91CF"),
+            align: 'center',
+            ellipsis: true,
+            width: 100,
+            render: function render(val, record, index) {
+              return record.canUpdateNumber && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
+                style: {
+                  width: 70
+                },
+                value: val,
+                min: 1,
+                precision: 0,
+                onChange: function onChange(num) {
+                  return updateHandle(num, index, 'number');
+                }
+              }) : /*#__PURE__*/React.createElement("span", null, val);
+            }
+          }, {
+            dataIndex: 'share',
+            title: "\u5206\u644A\u4EF7",
+            align: 'center',
+            ellipsis: true,
+            width: 70
+          }, {
+            dataIndex: 'type',
+            title: "\u8D60\u54C1\u7C7B\u578B",
+            align: 'center',
+            ellipsis: true,
+            width: 100
+          }, {
+            dataIndex: 'batch',
+            title: "\u6279\u6B21\u53F7",
+            align: 'center',
+            ellipsis: true,
+            width: 100
+          }, {
+            dataIndex: 'expireDate',
+            title: "\u6709\u6548\u671F",
+            align: 'center',
+            ellipsis: true,
+            width: 100
+          }];
+          break;
         default:
           columns = [{
             dataIndex: 'mark',
@@ -13485,7 +13720,7 @@ var GoodItem$1 = function GoodItem(props) {
   }), /*#__PURE__*/React.createElement(Button, {
     type: "link",
     onClick: handleChangeGoods
-  }, ['BS_E3_GOODS', 'BS_E3_REISSUE_GOODS', 'BS_E3_EXCHANGE_GOODS'].includes(type) ? '选择百胜ERP商品' : '选择商品'), otherOperations), /*#__PURE__*/React.createElement(Table, _objectSpread2(_objectSpread2({}, tableConfig), {}, {
+  }, getButtonText(type)), otherOperations), /*#__PURE__*/React.createElement(Table, _objectSpread2(_objectSpread2({}, tableConfig), {}, {
     columns: newColumns,
     dataSource: value,
     rowKey: 'uuid',
@@ -15164,7 +15399,7 @@ var typeMap$1 = {
   }
 };
 var wdtReissue = function wdtReissue(props) {
-  var _value$wdtSystemOrder, _typeMap$type24, _typeMap$type25, _value$typeMap$type$s5, _typeMap$type26, _typeMap$type27, _typeMap$type28;
+  var _value$wdtSystemOrder, _typeMap$type25, _typeMap$type27, _typeMap$type28, _value$typeMap$type$s5, _typeMap$type29, _typeMap$type30, _typeMap$type31;
   var value = props.value,
     onChange = props.onChange,
     _props$reasonList = props.reasonList,
@@ -15324,11 +15559,20 @@ var wdtReissue = function wdtReissue(props) {
     }
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   };
+  var selectedGoodsChange = useCallback(function (skuList) {
+    var _typeMap$type23, _value, _typeMap$type24;
+    var newValue = _objectSpread2({}, value);
+    newValue["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type23 = typeMap$1[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.key)] = value === null || value === void 0 ? void 0 : (_value = value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type24 = typeMap$1[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.key)]) === null || _value === void 0 ? void 0 : _value.filter(function (item) {
+      return skuList.includes(item.id);
+    });
+    console.log('newValue', newValue);
+    onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
+  }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type25 = typeMap$1[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.key)]]);
   //显示选择商品按钮 原单换不显示选择商品
   var showChangeBtn = useMemo(function () {
-    var _typeMap$type23;
-    return !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type23 = typeMap$1[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.systemOrderNo]);
-  }, [value === null || value === void 0 ? void 0 : value[(_typeMap$type24 = typeMap$1[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.systemOrderNo]]);
+    var _typeMap$type26;
+    return !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type26 = typeMap$1[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.systemOrderNo]);
+  }, [value === null || value === void 0 ? void 0 : value[(_typeMap$type27 = typeMap$1[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.systemOrderNo]]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Row, {
     gutter: 8,
     wrap: true
@@ -15346,12 +15590,12 @@ var wdtReissue = function wdtReissue(props) {
     },
     disabled: disabled,
     allowClear: false,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type25 = typeMap$1[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.systemOrderNo)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type28 = typeMap$1[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.systemOrderNo)],
     onChange: function onChange(val) {
       return changeSystemOrderHandle(val);
     },
     placeholder: "\u9009\u62E9\u8865\u53D1\u7CFB\u7EDF\u5355"
-  }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s5 = value[(_typeMap$type26 = typeMap$1[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.systemOrder]) === null || _value$typeMap$type$s5 === void 0 ? void 0 : _value$typeMap$type$s5.showOrderInfo) || []).map(function (item) {
+  }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s5 = value[(_typeMap$type29 = typeMap$1[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.systemOrder]) === null || _value$typeMap$type$s5 === void 0 ? void 0 : _value$typeMap$type$s5.showOrderInfo) || []).map(function (item) {
     return /*#__PURE__*/React.createElement(Select.Option, {
       key: item.billNo,
       value: item.billNo,
@@ -15372,7 +15616,7 @@ var wdtReissue = function wdtReissue(props) {
     disabled: disabled,
     allowClear: false,
     options: reasonList,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type27 = typeMap$1[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.typeName)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type30 = typeMap$1[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.typeName)],
     onChange: function onChange(val) {
       return changeTypeHandle(val);
     }
@@ -15384,13 +15628,19 @@ var wdtReissue = function wdtReissue(props) {
     canUpdateNumber: showChangeBtn,
     showChangeBtn: showChangeBtn,
     shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type28 = typeMap$1[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.key)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type31 = typeMap$1[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.key)],
     onChange: function onChange(val) {
       return changeGoodHandle(val);
     },
     onModeChange: handleModeChange,
     showModeBtn: showModeBtn,
-    isStrict: isStrict
+    isStrict: isStrict,
+    tradeGoods: {
+      originDataSource: getGoodDetails({
+        mode: isStrict
+      }),
+      selectedGoodsChange: selectedGoodsChange
+    }
   })));
 };
 

package/dist/index.js

@@ -12588,6 +12588,104 @@ var getBsE3ReissueGoodColumns = function getBsE3ReissueGoodColumns(_ref4) {
   });
 };
 
+var columns$4 = [{
+  dataIndex: 'goodId',
+  title: "\u5546\u54C1ID",
+  width: 70
+}, {
+  dataIndex: 'goodNo',
+  title: "\u5546\u54C1\u7F16\u7801",
+  width: 180
+}, {
+  dataIndex: 'goodName',
+  title: "\u5546\u54C1\u540D\u79F0",
+  width: 250
+}, {
+  dataIndex: 'specId',
+  title: "SKUID",
+  width: 100
+}, {
+  dataIndex: 'specNo',
+  title: "\u5546\u54C1SKU\u7F16\u7801",
+  width: 180
+}, {
+  dataIndex: 'specName',
+  title: "\u5546\u54C1SKU\u540D\u79F0",
+  width: 250
+}, {
+  dataIndex: 'orderPrice',
+  title: "\u5B9E\u4ED8\u603B\u91D1\u989D",
+  width: 100
+}, {
+  dataIndex: 'num',
+  title: "\u6570\u91CF",
+  width: 100
+}, {
+  dataIndex: 'sharePrice',
+  title: "\u5206\u644A\u4EF7",
+  width: 70
+}, {
+  dataIndex: 'giftType',
+  title: "\u8D60\u54C1\u65B9\u5F0F",
+  width: 100
+}];
+var renderFieldMap$1 = {
+  num: function num(_ref) {
+    var disabled = _ref.disabled,
+      updateHandle = _ref.updateHandle;
+    return function (val, record, index) {
+      return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
+        style: {
+          width: 70
+        },
+        value: val,
+        min: 1,
+        precision: 0,
+        onChange: function onChange(num) {
+          return updateHandle(num, index, 'num');
+        }
+      }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
+    };
+  },
+  giftType: function giftType(_ref2) {
+    var disabled = _ref2.disabled,
+      updateHandle = _ref2.updateHandle;
+    return function (val) {
+      var giftTypeMap = {
+        0: '非赠品',
+        1: '自动赠送',
+        2: '手工赠送',
+        3: '回购自动送赠品',
+        4: '前N有礼送赠品',
+        6: '天猫优仓赠品',
+        7: '淘宝CRM会员送赠'
+      };
+      return /*#__PURE__*/React__default['default'].createElement("span", null, giftTypeMap[val]);
+    };
+  }
+};
+var getWdtReissueGoodColumns = function getWdtReissueGoodColumns(_ref3) {
+  var disabled = _ref3.disabled,
+    updateHandle = _ref3.updateHandle,
+    operate = _ref3.operate;
+  return columns$4.map(function (item) {
+    var newItem = _objectSpread2({
+      align: 'center',
+      ellipsis: true
+    }, item);
+    if (operate && (renderFieldMap$1 === null || renderFieldMap$1 === void 0 ? void 0 : renderFieldMap$1[item.dataIndex])) {
+      return _objectSpread2(_objectSpread2({}, newItem), {}, {
+        render: renderFieldMap$1 === null || renderFieldMap$1 === void 0 ? void 0 : renderFieldMap$1[item.dataIndex]({
+          disabled: disabled,
+          updateHandle: updateHandle
+        })
+      });
+    }
+    return newItem;
+  });
+};
+
+var MAIN_FIELD = 'id';
 var SelectTradeGoods = function SelectTradeGoods(_ref) {
   var columns = _ref.columns,
     dataSource = _ref.dataSource,
@@ -12603,11 +12701,20 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
   var closeModal = function closeModal() {
     return setTradeGoodsVisible(false);
   };
+  var currentTradeOriginGoods = lodash.intersection(dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (item) {
+    return item === null || item === void 0 ? void 0 : item[MAIN_FIELD];
+  }), selectedRowKeys);
+  var unCurrentTradeOriginGoods = lodash.difference(selectedRowKeys, dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (item) {
+    return item === null || item === void 0 ? void 0 : item[MAIN_FIELD];
+  }));
+  var handleChangeSelectedKeys = function handleChangeSelectedKeys(keys) {
+    console.log('handleChangeSelectedKeys', keys, unCurrentTradeOriginGoods);
+    onChangeSelectedKeys(keys.concat(unCurrentTradeOriginGoods));
+  };
   var rowSelection = {
     selectedRowKeys: selectedRowKeys,
-    onChange: onChangeSelectedKeys
+    onChange: handleChangeSelectedKeys
   };
-  console.debug('选择订单商品-dataSource', dataSource, selectedRowKeys);
   return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Button, {
     type: "link",
     onClick: openModal
@@ -12617,7 +12724,7 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     footer: null,
     onCancel: closeModal
   }, /*#__PURE__*/React__default['default'].createElement(antd.Table, {
-    rowKey: "id",
+    rowKey: MAIN_FIELD,
     rowSelection: rowSelection,
     columns: columns,
     dataSource: dataSource,
@@ -12626,7 +12733,17 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
       x: 500,
       y: 500
     }
-  }), /*#__PURE__*/React__default['default'].createElement("span", null, "\u5DF2\u9009\u62E9(", selectedRowKeys === null || selectedRowKeys === void 0 ? void 0 : selectedRowKeys.length, "/", dataSource === null || dataSource === void 0 ? void 0 : dataSource.length, ")")));
+  }), /*#__PURE__*/React__default['default'].createElement("span", null, "\u5DF2\u9009\u62E9(", currentTradeOriginGoods === null || currentTradeOriginGoods === void 0 ? void 0 : currentTradeOriginGoods.length, "/", dataSource === null || dataSource === void 0 ? void 0 : dataSource.length, ")")));
+};
+var getButtonText = function getButtonText() {
+  var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+  if (['BS_E3_GOODS', 'BS_E3_REISSUE_GOODS', 'BS_E3_EXCHANGE_GOODS'].includes(type)) {
+    return '选择百胜ERP商品';
+  }
+  if (['WDT_REISSUE_GOODS'].includes(type)) {
+    return '选择旺店通商品';
+  }
+  return '选择商品';
 };
 var GoodItem$1 = function GoodItem(props) {
   var _props$value = props.value,
@@ -12683,7 +12800,7 @@ var GoodItem$1 = function GoodItem(props) {
   // TODO: 商品订单中以选中商品
   var selectedGoods = React.useMemo(function () {
     return value === null || value === void 0 ? void 0 : value.map(function (v) {
-      return v.id;
+      return v === null || v === void 0 ? void 0 : v[MAIN_FIELD];
     });
   }, [value]);
   var updateHandle = function updateHandle(val, index, columnType) {
@@ -12724,6 +12841,14 @@ var GoodItem$1 = function GoodItem(props) {
       var columns = [];
       switch (type) {
         case 'WDT_REISSUE_GOODS':
+          {
+            columns = getWdtReissueGoodColumns({
+              disabled: disabled,
+              updateHandle: updateHandle,
+              operate: operate
+            });
+          }
+          break;
         case 'WDT_GOODS':
           columns = [{
             dataIndex: 'goodId',
@@ -13229,6 +13354,116 @@ var GoodItem$1 = function GoodItem(props) {
             });
           }
           break;
+        case 'BS_GOODS':
+          columns = [{
+            dataIndex: 'mark',
+            title: "\u5546\u54C1\u6807\u8BB0",
+            align: 'center',
+            ellipsis: true,
+            width: 70,
+            render: function render(val, record, index) {
+              return /*#__PURE__*/React__default['default'].createElement(antd.Select, {
+                options: [{
+                  label: '是',
+                  value: '是'
+                }, {
+                  label: '否',
+                  value: '否'
+                }],
+                disabled: disabled,
+                value: val,
+                onChange: function onChange(val) {
+                  return updateHandle(val, index, 'mark');
+                }
+              });
+            }
+          }, {
+            dataIndex: 'skuName',
+            title: "".concat(text, "sku\u540D\u79F0"),
+            align: 'center',
+            ellipsis: true,
+            width: 250
+          }, {
+            dataIndex: 'sku',
+            title: "".concat(text, "sku\u7F16\u7801"),
+            align: 'center',
+            ellipsis: true,
+            width: 100
+          }, {
+            dataIndex: 'name',
+            title: "".concat(text, "\u540D\u79F0"),
+            align: 'center',
+            ellipsis: true,
+            width: 250
+          }, {
+            dataIndex: 'pic',
+            title: "\u56FE\u7247",
+            align: 'center',
+            ellipsis: true,
+            width: 100,
+            render: function render(val) {
+              return /*#__PURE__*/React__default['default'].createElement(antd.Image, {
+                width: 60,
+                src: val
+              });
+            }
+          }, {
+            dataIndex: 'code',
+            title: "".concat(text, "\u7F16\u7801"),
+            align: 'center',
+            ellipsis: true,
+            width: 100
+          }, {
+            dataIndex: 'money',
+            title: "\u5B9E\u4ED8\u91D1\u989D",
+            align: 'center',
+            ellipsis: true,
+            width: 100
+          }, {
+            dataIndex: 'number',
+            title: "".concat(text, "\u6570\u91CF"),
+            align: 'center',
+            ellipsis: true,
+            width: 100,
+            render: function render(val, record, index) {
+              return record.canUpdateNumber && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
+                style: {
+                  width: 70
+                },
+                value: val,
+                min: 1,
+                precision: 0,
+                onChange: function onChange(num) {
+                  return updateHandle(num, index, 'number');
+                }
+              }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
+            }
+          }, {
+            dataIndex: 'share',
+            title: "\u5206\u644A\u4EF7",
+            align: 'center',
+            ellipsis: true,
+            width: 70
+          }, {
+            dataIndex: 'type',
+            title: "\u8D60\u54C1\u7C7B\u578B",
+            align: 'center',
+            ellipsis: true,
+            width: 100
+          }, {
+            dataIndex: 'batch',
+            title: "\u6279\u6B21\u53F7",
+            align: 'center',
+            ellipsis: true,
+            width: 100
+          }, {
+            dataIndex: 'expireDate',
+            title: "\u6709\u6548\u671F",
+            align: 'center',
+            ellipsis: true,
+            width: 100
+          }];
+          break;
         default:
           columns = [{
             dataIndex: 'mark',
@@ -13497,7 +13732,7 @@ var GoodItem$1 = function GoodItem(props) {
   }), /*#__PURE__*/React__default['default'].createElement(antd.Button, {
     type: "link",
     onClick: handleChangeGoods
-  }, ['BS_E3_GOODS', 'BS_E3_REISSUE_GOODS', 'BS_E3_EXCHANGE_GOODS'].includes(type) ? '选择百胜ERP商品' : '选择商品'), otherOperations), /*#__PURE__*/React__default['default'].createElement(antd.Table, _objectSpread2(_objectSpread2({}, tableConfig), {}, {
+  }, getButtonText(type)), otherOperations), /*#__PURE__*/React__default['default'].createElement(antd.Table, _objectSpread2(_objectSpread2({}, tableConfig), {}, {
     columns: newColumns,
     dataSource: value,
     rowKey: 'uuid',
@@ -15176,7 +15411,7 @@ var typeMap$1 = {
   }
 };
 var wdtReissue = function wdtReissue(props) {
-  var _value$wdtSystemOrder, _typeMap$type24, _typeMap$type25, _value$typeMap$type$s5, _typeMap$type26, _typeMap$type27, _typeMap$type28;
+  var _value$wdtSystemOrder, _typeMap$type25, _typeMap$type27, _typeMap$type28, _value$typeMap$type$s5, _typeMap$type29, _typeMap$type30, _typeMap$type31;
   var value = props.value,
     onChange = props.onChange,
     _props$reasonList = props.reasonList,
@@ -15336,11 +15571,20 @@ var wdtReissue = function wdtReissue(props) {
     }
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   };
+  var selectedGoodsChange = React.useCallback(function (skuList) {
+    var _typeMap$type23, _value, _typeMap$type24;
+    var newValue = _objectSpread2({}, value);
+    newValue["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type23 = typeMap$1[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.key)] = value === null || value === void 0 ? void 0 : (_value = value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type24 = typeMap$1[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.key)]) === null || _value === void 0 ? void 0 : _value.filter(function (item) {
+      return skuList.includes(item.id);
+    });
+    console.log('newValue', newValue);
+    onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
+  }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type25 = typeMap$1[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.key)]]);
   //显示选择商品按钮 原单换不显示选择商品
   var showChangeBtn = React.useMemo(function () {
-    var _typeMap$type23;
-    return !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type23 = typeMap$1[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.systemOrderNo]);
-  }, [value === null || value === void 0 ? void 0 : value[(_typeMap$type24 = typeMap$1[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.systemOrderNo]]);
+    var _typeMap$type26;
+    return !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type26 = typeMap$1[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.systemOrderNo]);
+  }, [value === null || value === void 0 ? void 0 : value[(_typeMap$type27 = typeMap$1[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.systemOrderNo]]);
   return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Row, {
     gutter: 8,
     wrap: true
@@ -15358,12 +15602,12 @@ var wdtReissue = function wdtReissue(props) {
     },
     disabled: disabled,
     allowClear: false,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type25 = typeMap$1[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.systemOrderNo)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type28 = typeMap$1[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.systemOrderNo)],
     onChange: function onChange(val) {
       return changeSystemOrderHandle(val);
     },
     placeholder: "\u9009\u62E9\u8865\u53D1\u7CFB\u7EDF\u5355"
-  }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s5 = value[(_typeMap$type26 = typeMap$1[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.systemOrder]) === null || _value$typeMap$type$s5 === void 0 ? void 0 : _value$typeMap$type$s5.showOrderInfo) || []).map(function (item) {
+  }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s5 = value[(_typeMap$type29 = typeMap$1[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.systemOrder]) === null || _value$typeMap$type$s5 === void 0 ? void 0 : _value$typeMap$type$s5.showOrderInfo) || []).map(function (item) {
     return /*#__PURE__*/React__default['default'].createElement(antd.Select.Option, {
       key: item.billNo,
       value: item.billNo,
@@ -15384,7 +15628,7 @@ var wdtReissue = function wdtReissue(props) {
     disabled: disabled,
     allowClear: false,
     options: reasonList,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type27 = typeMap$1[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.typeName)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type30 = typeMap$1[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.typeName)],
     onChange: function onChange(val) {
       return changeTypeHandle(val);
     }
@@ -15396,13 +15640,19 @@ var wdtReissue = function wdtReissue(props) {
     canUpdateNumber: showChangeBtn,
     showChangeBtn: showChangeBtn,
     shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type28 = typeMap$1[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.key)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type31 = typeMap$1[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.key)],
     onChange: function onChange(val) {
       return changeGoodHandle(val);
     },
     onModeChange: handleModeChange,
     showModeBtn: showModeBtn,
-    isStrict: isStrict
+    isStrict: isStrict,
+    tradeGoods: {
+      originDataSource: getGoodDetails({
+        mode: isStrict
+      }),
+      selectedGoodsChange: selectedGoodsChange
+    }
   })));
 };
 

package/dist/src/bs/component/GoodItem/wdtReissueGoodsColumns.d.ts

@@ -0,0 +1,21 @@
+import React from 'react';
+type P = {
+    disabled: boolean | undefined;
+    updateHandle: (v: any, index: number, key: string) => void;
+    operate?: boolean;
+};
+export declare const getWdtReissueGoodColumns: ({ disabled, updateHandle, operate }: P) => ({
+    dataIndex: string;
+    title: string;
+    width: number;
+    align: string;
+    ellipsis: boolean;
+} | {
+    render: (val: any, record: any, index: number) => React.JSX.Element;
+    dataIndex: string;
+    title: string;
+    width: number;
+    align: string;
+    ellipsis: boolean;
+})[];
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "1.22.1-beta.0",
+  "version": "1.22.1-beta.10",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -11,16 +11,16 @@
     "dist"
   ],
   "scripts": {
-    "sync": "yarn build && yalc push",
     "build": "yarn lint && father-build",
     "lint": "eslint '**/*.{ts,tsx}'",
     "lint:fix": "eslint --fix '**/*.{ts,tsx}'",
     "start": "dumi dev",
+    "sync": "yarn build && yalc push",
     "test": "jest",
     "watch": "nodemon --ignore dist/ --ignore node_modules/ --watch src/ -C -e ts,tsx,less --debug -x 'yarn async'"
   },
   "dependencies": {
-    "@kmkf-fe-packages/kmkf-utils": "1.22.1-beta.0",
+    "@kmkf-fe-packages/kmkf-utils": "1.22.1-beta.10",
     "ahooks": "^3.7.4",
     "bignumber.js": "^9.1.2",
     "kmkf-monitor": "^0.8.9",
@@ -65,5 +65,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0fe6eb2f00f1a864386cb87e5a1494cb6564fcae"
+  "gitHead": "143523e8020568c583dfb07a1044dc12ade967ee"
 }